drivers/misc: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
master
Jean-Christophe PLAGNIOL-VILLARD 17 years ago
parent 65e41ea054
commit 55d6d2d39f
  1. 6
      drivers/misc/Makefile
  2. 5
      drivers/misc/ali512x.c
  3. 4
      drivers/misc/ns87308.c
  4. 4
      drivers/misc/status_led.c
  5. 4
      drivers/serial/serial.c
  6. 2
      include/configs/BAB7xx.h
  7. 2
      include/configs/HIDDEN_DRAGON.h
  8. 2
      include/configs/Sandpoint8240.h
  9. 2
      include/configs/Sandpoint8245.h

@ -25,10 +25,10 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libmisc.a
COBJS-y += ali512x.o
COBJS-y += ns87308.o
COBJS-y += status_led.o
COBJS-$(CONFIG_ALI152X) += ali512x.o
COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
COBJS-$(CONFIG_NS87308) += ns87308.o
COBJS-$(CONFIG_STATUS_LED) += status_led.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)

@ -32,8 +32,6 @@
#include <config.h>
#ifdef CONFIG_ALI152X
#include <common.h>
#include <asm/io.h>
#include <asm/ic/ali512x.h>
@ -418,6 +416,3 @@ int ali512x_cio_in(int pin)
return data & bit;
}
#endif

@ -23,8 +23,6 @@
#include <config.h>
#ifdef CFG_NS87308
#include <ns87308.h>
void initialise_ns87308 (void)
@ -117,5 +115,3 @@ void initialise_ns87308 (void)
PNP_PGCS_CSLINE_CONF(2, CFG_NS87308_CS2_CONF);
#endif
}
#endif

@ -35,8 +35,6 @@
/* ------------------------------------------------------------------------- */
#ifdef CONFIG_STATUS_LED
typedef struct {
led_id_t mask;
int state;
@ -127,5 +125,3 @@ void status_led_set (int led, int state)
}
__led_set (ld->mask, state);
}
#endif /* CONFIG_STATUS_LED */

@ -26,7 +26,7 @@
#ifdef CFG_NS16550_SERIAL
#include <ns16550.h>
#ifdef CFG_NS87308
#ifdef CONFIG_NS87308
#include <ns87308.h>
#endif
@ -159,7 +159,7 @@ int serial_init (void)
{
int clock_divisor;
#ifdef CFG_NS87308
#ifdef CONFIG_NS87308
initialise_ns87308();
#endif

@ -346,7 +346,7 @@ extern unsigned char scsi_sym53c8xx_ccf;
/*
* NS87308 Configuration
*/
#define CFG_NS87308 /* Nat Semi super-io cntr on ISA bus */
#define CONFIG_NS87308 /* Nat Semi super-io cntr on ISA bus */
#define CFG_NS87308_BADDR_10 1
#define CFG_NS87308_DEVS (CFG_NS87308_UART1 | \
CFG_NS87308_UART2 | \

@ -214,7 +214,7 @@
/*
* NS87308 Configuration
*/
#define CFG_NS87308 /* Nat Semi super-io controller on ISA bus */
#define CONFIG_NS87308 /* Nat Semi super-io controller on ISA bus */
#define CFG_NS87308_BADDR_10 1

@ -246,7 +246,7 @@
/*
* NS87308 Configuration
*/
#define CFG_NS87308 /* Nat Semi super-io controller on ISA bus */
#define CONFIG_NS87308 /* Nat Semi super-io controller on ISA bus */
#define CFG_NS87308_BADDR_10 1

@ -214,7 +214,7 @@
/*
* NS87308 Configuration
*/
#define CFG_NS87308 /* Nat Semi super-io controller on ISA bus */
#define CONFIG_NS87308 /* Nat Semi super-io controller on ISA bus */
#define CFG_NS87308_BADDR_10 1

Loading…
Cancel
Save