Signed-off-by: Tom Rini trini@konsulko.com --- drivers/net/dm9000x.c | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/devkit8000.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 6bf316263d59..514b8db2ce1e 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -550,7 +550,7 @@ static int dm9000_recv_common(struct dm9000_priv *db, uchar *rdptr) /* * Read a word data from SROM */ -#if !defined(CONFIG_DM9000_NO_SROM) +#if !defined(CFG_DM9000_NO_SROM) static void dm9000_read_srom_word(struct dm9000_priv *db, int offset, u8 *to) { dm9000_iow(db, DM9000_EPAR, offset); diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index d58c0f4bbe24..a9bbbd39484a 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -39,7 +39,7 @@ #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT -#define CONFIG_DM9000_NO_SROM +#define CFG_DM9000_NO_SROM
/* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9261_UHP_BASE */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 824e0e448eea..1694bf1cd3e1 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -22,7 +22,7 @@ #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 0x400) #define CONFIG_DM9000_USE_16BIT 1 -#define CONFIG_DM9000_NO_SROM 1 +#define CFG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG
/* TWL4030 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 005b893b317c..85adbafa58fe 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7,7 +7,7 @@ CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS CFG_DM9000_BASE CFG_DM9000_BYTE_SWAPPED -CONFIG_DM9000_NO_SROM +CFG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DW_WDT_CLOCK_KHZ CONFIG_ENV_FLAGS_LIST_STATIC