diff options
Diffstat (limited to 'include/configs')
259 files changed, 216 insertions, 592 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index c9742f37f4..b737e461c7 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -12,7 +12,6 @@ /* * BOARD/CPU */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * SERIAL diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index afd6488e10..e64f6d8503 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -12,7 +12,6 @@ /* * BOARD/CPU */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * SERIAL diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index d339c1a939..3bbb18abdc 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -167,7 +167,6 @@ unsigned long get_board_ddr_clk(void); #endif #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -407,7 +406,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 6ad82b8eb1..f81f0de7a5 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -45,7 +45,6 @@ /* High Level Configuration Options */ -#define CONFIG_TSEC_ENET #define CONFIG_ENV_OVERWRITE #define CONFIG_DDR_CLK_FREQ 66666666 /* DDRCLK on 9131 RDB */ @@ -325,7 +324,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_HAS_ETH0 #endif -#define CONFIG_HOSTNAME BSC9131rdb +#define CONFIG_HOSTNAME "BSC9131rdb" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 55e73bdc5c..fb4762d3cf 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -88,7 +88,6 @@ #endif #define CONFIG_ENV_OVERWRITE -#define CONFIG_TSEC_ENET /* ethernet */ #if defined(CONFIG_SYS_CLK_100_DDR_100) #define CONFIG_SYS_CLK_FREQ 100000000 @@ -356,8 +355,6 @@ combinations. this should be removed later #define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 #endif -#define CONFIG_BOARD_EARLY_INIT_R - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000 /* End of used area in RAM */ @@ -457,7 +454,6 @@ combinations. this should be removed later #endif /* CONFIG_TSEC_ENET */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -532,7 +528,7 @@ combinations. this should be removed later #define CONFIG_HAS_ETH1 #endif -#define CONFIG_HOSTNAME BSC9132qds +#define CONFIG_HOSTNAME "BSC9132qds" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index a12ccceca4..9c4d2d1a5f 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -89,7 +89,6 @@ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #endif -#define CONFIG_TSEC_ENET #define CONFIG_ENV_OVERWRITE #define CONFIG_DDR_CLK_FREQ 100000000 @@ -283,8 +282,6 @@ #define CONFIG_SYS_EXTRA_ENV_RELOC #endif -#define CONFIG_BOARD_EARLY_INIT_R - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000 diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 3385dcb5b7..4a1a8ffafb 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -64,7 +64,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME M5208EVBe +#define CONFIG_HOSTNAME "M5208EVBe" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 7798b06625..2e2e512814 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -31,7 +31,7 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_HOSTNAME M52277EVB +#define CONFIG_HOSTNAME "M52277EVB" #define CONFIG_SYS_UBOOT_END 0x3FFFF #define CONFIG_SYS_LOAD_ADDR2 0x40010007 #ifdef CONFIG_SYS_STMICRO_BOOT diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index d221f718f0..e507ad92bf 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -76,7 +76,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M5235EVB +#define CONFIG_HOSTNAME "M5235EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index cf10f306c7..b9f30ccc0a 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -77,7 +77,7 @@ "" #endif -#define CONFIG_HOSTNAME M5253DEMO +#define CONFIG_HOSTNAME "M5253DEMO" /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 936a91e27d..ab5ebbd5b8 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -80,7 +80,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME M5272C3 +#define CONFIG_HOSTNAME "M5272C3" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index b29515077a..26b9ef3e53 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -72,7 +72,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME M5282EVB +#define CONFIG_HOSTNAME "M5282EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 96fb87bc7c..69b7d8644b 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -81,7 +81,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M53017 +#define CONFIG_HOSTNAME "M53017" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 5a994859f1..6dcd41a4c7 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -73,7 +73,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M5329EVB +#define CONFIG_HOSTNAME "M5329EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 7b2d1bb398..faf098e2b8 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -73,7 +73,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M5373EVB +#define CONFIG_HOSTNAME "M5373EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index ba9ba00698..c614193963 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -85,7 +85,7 @@ #endif /* CONFIG_SYS_DISCOVER_PHY */ #endif -#define CONFIG_HOSTNAME M54418TWR +#define CONFIG_HOSTNAME "M54418TWR" #if defined(CONFIG_CF_SBF) /* ST Micro serial flash */ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index b144332b22..bec0ca0ce1 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -64,7 +64,7 @@ # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif -#define CONFIG_HOSTNAME M54451EVB +#define CONFIG_HOSTNAME "M54451EVB" #ifdef CONFIG_SYS_STMICRO_BOOT /* ST Micro serial flash */ #define CONFIG_SYS_LOAD_ADDR2 0x40010007 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 14dd2a516e..fb3fee6103 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -67,7 +67,7 @@ # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif -#define CONFIG_HOSTNAME M54455EVB +#define CONFIG_HOSTNAME "M54455EVB" #ifdef CONFIG_SYS_STMICRO_BOOT /* ST Micro serial flash */ #define CONFIG_SYS_LOAD_ADDR2 0x40010013 diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 566f24e3b1..5c53e82f55 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -110,7 +110,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M547xEVB +#define CONFIG_HOSTNAME "M547xEVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 31564748bc..bc10284376 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -98,7 +98,7 @@ #define CONFIG_UDP_CHECKSUM -#define CONFIG_HOSTNAME M548xEVB +#define CONFIG_HOSTNAME "M548xEVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 6b03873ce8..aeda4742aa 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -9,7 +9,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -55,25 +54,14 @@ "${ofl_args}; " \ "bootm ${loadaddr} - 0xf00000\0" -#define CONFIG_BOOTDELAY 5 - #define CONFIG_IPADDR 192.168.0.3 #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_NETMASK 255.0.0.0 -#define CONFIG_BOOTCOMMAND "run flashboot" - #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ -#undef CONFIG_LOADS_BAUD_CHANGE /* don't allow baudrate change */ - -#define CONFIG_WATCHDOG 1 /* watchdog enabled */ /* Miscellaneous configurable options */ -#ifdef CONFIG_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "S3K> " -#endif - #define CONFIG_SYS_MEMTEST_START 0x00002000 #define CONFIG_SYS_MEMTEST_END 0x00800000 @@ -82,16 +70,11 @@ #define CONFIG_SYS_HZ 1000 /* Definitions for initial stack pointer and data area (in DPRAM) */ -#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_IMMR -#define CONFIG_SYS_INIT_RAM_SIZE 0x2f00 -#define CONFIG_SYS_GBL_DATA_SIZE 64 -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET +#define CONFIG_SYS_INIT_RAM_ADDR (CONFIG_SYS_IMMR + 0x2800) +#define CONFIG_SYS_INIT_RAM_SIZE (0x2e00 - 0x2800) /* RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero) */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define SDRAM_MAX_SIZE (32 * 1024 * 1024) /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE @@ -108,37 +91,24 @@ * the maximum mapped by the Linux kernel during initialization. */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) -#define CONFIG_SYS_MONITOR_LEN (256 << 10) +#define CONFIG_SYS_MONITOR_LEN (320 << 10) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Environment Configuration */ /* environment is in FLASH */ -#define CONFIG_ENV_SECT_SIZE (64 * 1024) -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE) +#define CONFIG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OVERWRITE 1 -/* Cache Configuration */ -#define CONFIG_SYS_CACHELINE_SIZE 16 - /* Ethernet configuration part */ #define CONFIG_SYS_DISCOVER_PHY 1 -#ifdef CONFIG_MPC8XX_FEC #define CONFIG_MII_INIT 1 -#endif /* NAND configuration part */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_BASE 0x0C000000 -/* Internal Definitions */ - -/* Boot Flags*/ -#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - #endif /* __CONFIG_H */ diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 4f5d6703e2..b62b11c9e5 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -19,7 +19,6 @@ #define CONFIG_MISC_INIT_R #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_USE_PIO #endif @@ -365,7 +364,6 @@ /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_SYS_TSEC1_OFFSET 0x24000 #define CONFIG_SYS_TSEC1 (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET) #define CONFIG_SYS_TSEC2_OFFSET 0x25000 diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 21ac664325..ef6d820d7d 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -73,8 +73,6 @@ #define CONFIG_SYS_CLK_FREQ CONFIG_83XX_CLKIN -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r */ - #define CONFIG_SYS_IMMR 0xE0000000 #if defined(CONFIG_NAND) && !defined(CONFIG_SPL_BUILD) @@ -386,7 +384,6 @@ /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_GMII /* MII PHY management */ @@ -607,7 +604,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME mpc8313erdb +#define CONFIG_HOSTNAME "mpc8313erdb" #define CONFIG_ROOTPATH "/nfs/root/path" #define CONFIG_BOOTFILE "uImage" /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 05e631fd07..9e01ae4475 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -363,7 +363,6 @@ /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_SYS_TSEC1_OFFSET 0x24000 #define CONFIG_SYS_TSEC1 (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET) #define CONFIG_SYS_TSEC2_OFFSET 0x25000 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 3f0e87fe8a..85ea171175 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -448,7 +448,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME mpc8323erdb +#define CONFIG_HOSTNAME "mpc8323erdb" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "uImage" /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index f92346d216..617e527b36 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -70,8 +70,6 @@ */ #define CONFIG_SYS_SICRL 0x00000000 -#define CONFIG_BOARD_EARLY_INIT_R - /* * IMMR new address */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 2fa1f7ab75..c40ba469b0 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -394,7 +394,6 @@ /* * TSEC configuration */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #if defined(CONFIG_TSEC_ENET) @@ -686,7 +685,7 @@ #define CONFIG_HAS_ETH0 #endif -#define CONFIG_HOSTNAME mpc8349emds +#define CONFIG_HOSTNAME "mpc8349emds" #define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index cb8bce12fa..0948d0d987 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -68,7 +68,6 @@ #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C -#define CONFIG_TSEC_ENET /* TSEC Ethernet support */ /* * Device configurations diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 0087e1d17c..69e8a1db67 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -95,7 +95,6 @@ */ #define CONFIG_SYS_OBIR 0x31100000 -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_HWCONFIG /* @@ -383,7 +382,6 @@ extern int board_pci_host_broken(void); /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_SYS_TSEC1_OFFSET 0x24000 #define CONFIG_SYS_TSEC1 (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET) #define CONFIG_SYS_TSEC2_OFFSET 0x25000 @@ -459,7 +457,6 @@ extern int board_pci_host_broken(void); #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR #endif diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index bc466981c5..7ebd6175a6 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -22,7 +22,6 @@ /* * On-board devices */ -#define CONFIG_TSEC_ENET /* TSEC Ethernet support */ #define CONFIG_VSC7385_ENET /* @@ -473,7 +472,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR #endif @@ -624,7 +622,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME mpc837x_rdb +#define CONFIG_HOSTNAME "mpc837x_rdb" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_RAMDISKFILE "rootfs.ext2.gz.uboot" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 09a5eaecd6..6843ef2866 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -41,7 +41,6 @@ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() /* sysclk for MPC85xx */ @@ -193,8 +192,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ - #define CONFIG_HWCONFIG /* enable hwconfig */ #define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */ #define PIXIS_BASE 0xffdf0000 /* PIXIS registers */ @@ -570,7 +567,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -616,7 +612,7 @@ #define CONFIG_IPADDR 192.168.1.254 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index a02e20ce68..a43210f4c8 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -29,7 +29,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE /* @@ -341,7 +340,7 @@ #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 27153b7192..d4753c4277 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -18,7 +18,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_FSL_VIA @@ -364,7 +363,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 917c92e60d..b2943fa622 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -20,7 +20,6 @@ #define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ @@ -371,7 +370,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_IPADDR 192.168.1.251 -#define CONFIG_HOSTNAME 8544ds_unknown +#define CONFIG_HOSTNAME "8544ds_unknown" #define CONFIG_ROOTPATH "/nfs/mpc85xx" #define CONFIG_BOOTFILE "8544ds/uImage.uboot" #define CONFIG_UBOOTPATH 8544ds/u-boot.bin /* TFTP server */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 5b6373e7df..0c44c16e66 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -24,7 +24,6 @@ #define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ @@ -479,7 +478,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "8548cds/uImage.uboot" #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 28cbdc5211..a74b24c390 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -18,7 +18,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_FSL_VIA @@ -360,7 +359,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index b76d2e80d7..13567e48af 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -28,7 +28,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #undef CONFIG_ETHER_ON_FCC /* cpm FCC ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */ @@ -377,7 +376,7 @@ #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index c27e7a31fe..7fb4054566 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -19,7 +19,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ #define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_QE /* Enable QE */ #define CONFIG_ENV_OVERWRITE @@ -378,7 +377,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index da9370bc11..6d0970582b 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -48,7 +48,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_ENABLE_36BIT_PHYS 1 -#define CONFIG_BOARD_EARLY_INIT_R 1 #define CONFIG_HWCONFIG #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ @@ -438,7 +437,6 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -471,7 +469,7 @@ extern unsigned long get_clock_freq(void); /* * Environment Configuration */ -#define CONFIG_HOSTNAME mpc8569mds +#define CONFIG_HOSTNAME "mpc8569mds" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index c1ff6e112f..c04b3a2af2 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -32,7 +32,6 @@ #define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() /* sysclk for MPC85xx */ @@ -180,8 +179,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ - #define CONFIG_HWCONFIG /* enable hwconfig */ #define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */ #define PIXIS_BASE 0xffdf0000 /* PIXIS registers */ @@ -572,7 +569,7 @@ #define CONFIG_IPADDR 192.168.1.254 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 0fc0d11bb0..3fd432e5c0 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -439,7 +439,7 @@ */ #define CONFIG_IPADDR 192.168.1.100 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH 8610hpcd/u-boot.bin diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 02fdd02282..9ede6dd9b1 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -44,7 +44,6 @@ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ @@ -603,7 +602,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_IPADDR 192.168.1.100 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 84c364ce53..4b880e1833 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024)) /* Enable alternate, more extensive, memory test */ -#undef CONFIG_SYS_ALT_MEMTEST /* Scratch address used by the alternate memory test */ #undef CONFIG_SYS_MEMTEST_SCRATCH diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index f6042580fa..9d07742065 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -180,7 +180,6 @@ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #endif -#define CONFIG_TSEC_ENET #define CONFIG_ENV_OVERWRITE #define CONFIG_DDR_CLK_FREQ 66666666 /* DDRCLK on P1010 RDB */ @@ -478,8 +477,6 @@ extern unsigned long get_sdram_size(void); #endif #endif -#define CONFIG_BOARD_EARLY_INIT_R - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000 /* End of used area in RAM */ @@ -636,7 +633,6 @@ extern unsigned long get_sdram_size(void); #endif /* #ifdef CONFIG_FSL_SATA */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index b4b4d83346..8dd4f91efb 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -264,7 +264,6 @@ #endif /* CONFIG_NAND_FSL_ELBC */ -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -488,11 +487,9 @@ #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif -#define CONFIG_TSEC_ENET #ifdef CONFIG_TSEC_ENET #define CONFIG_TSECV2 @@ -590,7 +587,7 @@ * Environment Configuration */ -#define CONFIG_HOSTNAME p1022ds +#define CONFIG_HOSTNAME "p1022ds" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 1328e021e2..aa12863b91 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -102,8 +102,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */ #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000/* Size of used area in RAM */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 0b5cde6dcf..3901a720ff 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -111,7 +111,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_POST CONFIG_SYS_POST_MEMORY /* test POST memory test */ #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -259,7 +258,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -572,7 +570,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index cd980bcb12..ea9be7d67d 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -189,7 +189,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -423,7 +422,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -628,7 +626,6 @@ unsigned long get_board_ddr_clk(void); * SDHC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 378ed188ed..e2dcca7f26 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -212,7 +212,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -432,7 +431,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -635,7 +633,6 @@ unsigned long get_board_ddr_clk(void); * SDHC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 68805108ac..df5b0f57e8 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -122,7 +122,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -339,7 +338,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -518,7 +516,6 @@ unsigned long get_board_ddr_clk(void); #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_FSL_ESDHC_ADAPTER_IDENT diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a45bf40f1f..e1f911a561 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -219,7 +219,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -445,7 +444,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #endif -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -628,7 +626,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 14a329f47b..492d12b867 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -395,7 +395,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -692,7 +691,6 @@ unsigned long get_board_ddr_clk(void); * SDHC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 03d933b954..5fe4c96b04 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -111,7 +111,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST #ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER @@ -343,7 +342,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -643,7 +641,6 @@ unsigned long get_board_ddr_clk(void); * SDHC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 597ba2ebcc..56f0a4e19e 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -489,7 +489,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 35e96b2156..5f743a9114 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -89,7 +89,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -133,7 +132,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #endif -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -644,7 +642,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 98a7c48240..b90f1cf603 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -40,7 +40,6 @@ /* board pre init: do not call, nothing to do */ /* detect the number of flash banks */ -#define CONFIG_BOARD_EARLY_INIT_R /* * DDR Setup @@ -183,7 +182,6 @@ /* * TSEC */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_MII #define CONFIG_SYS_TSEC1_OFFSET 0x24000 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 14d786804c..489e4e35f9 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -27,7 +27,6 @@ #define CONFIG_BOARDNAME "uCP1020-64EE512-0U1-XR-T1" -#define CONFIG_TSEC_ENET #define CONFIG_TSEC1 #define CONFIG_TSEC3 #define CONFIG_HAS_ETH0 @@ -46,8 +45,6 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) -#define CONFIG_LAST_STAGE_INIT - #endif #if defined(CONFIG_TARGET_UCP1020) @@ -57,7 +54,6 @@ #define CONFIG_BOARDNAME_LOCAL "uCP1020-64EEE512-OU1-XR" -#define CONFIG_TSEC_ENET #define CONFIG_TSEC1 #define CONFIG_TSEC2 #define CONFIG_TSEC3 @@ -81,8 +77,6 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) -#define CONFIG_LAST_STAGE_INIT - #endif #ifdef CONFIG_SDCARD @@ -237,8 +231,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ /* Initial L1 address */ @@ -418,7 +410,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_MMC_SPI #endif @@ -478,7 +469,7 @@ #endif -#define CONFIG_HOSTNAME UCP1020 +#define CONFIG_HOSTNAME "UCP1020" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 826cb45ba7..bcc7a6d168 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -44,7 +44,6 @@ #define CONFIG_LBA48 /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 158b7d4e8e..89334ffb0b 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -56,8 +56,6 @@ #define NANDARGS "" #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ "setenv mmcdev " #instance"; "\ @@ -74,14 +72,26 @@ #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ #devtypel #instance " " +#if CONFIG_IS_ENABLED(CMD_PXE) +# define BOOT_TARGET_PXE(func) func(PXE, pxe, na) +#else +# define BOOT_TARGET_PXE(func) +#endif + +#if CONFIG_IS_ENABLED(CMD_DHCP) +# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) +#else +# define BOOT_TARGET_DHCP(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(LEGACY_MMC, legacy_mmc, 0) \ func(MMC, mmc, 1) \ func(LEGACY_MMC, legacy_mmc, 1) \ func(NAND, nand, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) #include <config_distro_bootcmd.h> @@ -133,6 +143,8 @@ "setenv fdtfile am335x-bone.dtb; fi; " \ "if test $board_name = A335BNLT; then " \ "setenv fdtfile am335x-boneblack.dtb; fi; " \ + "if test $board_name = A335PBGL; then " \ + "setenv fdtfile am335x-pocketbeagle.dtb; fi; " \ "if test $board_name = BBBW; then " \ "setenv fdtfile am335x-boneblack-wireless.dtb; fi; " \ "if test $board_name = BBG1; then " \ diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index fe3f838598..a429dd9910 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -22,8 +22,6 @@ #define CONFIG_ENV_SIZE (96 << 10) /* 96 KiB */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 6fa117ef23..e29de0e15c 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -16,7 +16,6 @@ #include <configs/ti_am335x_common.h> /* settings we don;t want on this board */ -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_CMD_SPI #define CONFIG_CMD_CACHE @@ -65,8 +64,6 @@ # define CONFIG_RESET_TO_RETRY #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ @@ -251,7 +248,6 @@ #undef CONFIG_TIMER #endif -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 739a99860b..9687f3765a 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -26,8 +26,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 663f861706..d2c1810bfd 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -62,8 +62,6 @@ /* Always 64 KiB env size */ #define CONFIG_ENV_SIZE (64 << 10) -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) @@ -221,7 +219,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #endif -#define CONFIG_DRIVER_TI_CPSW #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ #define CONFIG_SYS_RX_ETH_BUFFER 64 diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index c079a3ace0..7211cde252 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -78,7 +78,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 569fd982b6..58c77deac7 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -9,7 +9,7 @@ #ifndef __AMCORE_CONFIG_H #define __AMCORE_CONFIG_H -#define CONFIG_HOSTNAME AMCORE +#define CONFIG_HOSTNAME "AMCORE" #define CONFIG_MCFTMR #define CONFIG_MCFUART diff --git a/include/configs/ap121.h b/include/configs/ap121.h index e1a192d8f3..247f44bbad 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -43,6 +43,5 @@ */ #define CONFIG_SYS_MEMTEST_START 0x80100000 #define CONFIG_SYS_MEMTEST_END 0x83f00000 -#define CONFIG_CMD_MEMTEST #endif /* __CONFIG_H */ diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 94b5332147..00588ab5ed 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -47,6 +47,5 @@ */ #define CONFIG_SYS_MEMTEST_START 0x80100000 #define CONFIG_SYS_MEMTEST_END 0x83f00000 -#define CONFIG_CMD_MEMTEST #endif /* __CONFIG_H */ diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index b749826223..098bafe592 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -37,7 +37,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024)) /* Enable alternate, more extensive, memory test */ -#undef CONFIG_SYS_ALT_MEMTEST /* Scratch address used by the alternate memory test */ #undef CONFIG_SYS_MEMTEST_SCRATCH diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index d46a588a8d..6df2ff9822 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + CONFIG_SYS_SDRAM_SIZE) /* Enable alternate, more extensive, memory test */ -#undef CONFIG_SYS_ALT_MEMTEST /* Scratch address used by the alternate memory test */ #undef CONFIG_SYS_MEMTEST_SCRATCH diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 5f53a52511..f9970b81dc 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -16,7 +16,6 @@ #define CONFIG_ARCH_MISC_INIT /* High-level configuration options */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 9e5a7e5270..eb8ffda67e 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -12,7 +12,6 @@ #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ #define CONFIG_MACH_TYPE 4886 @@ -39,10 +38,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* Make the HW version stuff available in U-Boot env */ -#define CONFIG_VERSION_VARIABLE /* ver environment variable */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC @@ -57,7 +52,6 @@ #endif /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 3 @@ -253,7 +247,6 @@ #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 48 -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 16dce4af9e..9d59e69cba 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -14,7 +14,6 @@ #include "tegra30-common.h" /* High-level configuration options */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/apf27.h b/include/configs/apf27.h index e1d4aa6a72..ceca5ba949 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -42,7 +42,7 @@ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_DNS2 -#define CONFIG_HOSTNAME CONFIG_BOARD_NAME +#define CONFIG_HOSTNAME "apf27" #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" /* diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 1799cc1f32..a671611cd8 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -14,7 +14,7 @@ #define __ARISTAINETOS_CONFIG_H #define CONFIG_SYS_BOARD_VERSION 1 -#define CONFIG_HOSTNAME aristainetos +#define CONFIG_HOSTNAME "aristainetos" #define CONFIG_BOARDNAME "aristainetos" #define CONFIG_MXC_UART_BASE UART5_BASE diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 9cd40a7616..3584c27a61 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -13,7 +13,7 @@ #define __ARISTAINETOS2_CONFIG_H #define CONFIG_SYS_BOARD_VERSION 2 -#define CONFIG_HOSTNAME aristainetos2 +#define CONFIG_HOSTNAME "aristainetos2" #define CONFIG_BOARDNAME "aristainetos2" #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index a680e762d7..9befb89b37 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -13,7 +13,7 @@ #define __ARISTAINETOS2B_CONFIG_H #define CONFIG_SYS_BOARD_VERSION 3 -#define CONFIG_HOSTNAME aristainetos2 +#define CONFIG_HOSTNAME "aristainetos2" #define CONFIG_BOARDNAME "aristainetos2-revB" #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 9aca91a18e..6e7ac0a905 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MEMTEST_START (ARMADILLO_800EVA_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ 504 * 1024 * 1024) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 943a6f819d..19db35052e 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -69,8 +69,6 @@ #define NANDARGS "" #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index e7f65d6d03..a044329fbf 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -56,8 +56,6 @@ #define NANDARGS "" #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 9c666430f5..f0eba6bd8f 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -9,7 +9,7 @@ #include <linux/sizes.h> -#define CONFIG_HOSTNAME northstar2 +#define CONFIG_HOSTNAME "northstar2" /* Physical Memory Map */ #define V2M_BASE 0x80000000 diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 506b783d34..8c1959d264 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_MEMTEST_START (RCAR_GEN2_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 504 * 1024 * 1024) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index e8abe531ef..37d6aa5f4c 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -17,7 +17,6 @@ /* Timer information */ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ -#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* enable 32kHz OSC at bootime */ #define CONFIG_POWER_TPS65217 #include <asm/arch/omap.h> @@ -29,7 +28,6 @@ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ /* Network defines */ -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_NATSEMI diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index afc0bae167..b3814a6ce6 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -99,7 +99,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 596e0605e3..922ba93c69 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -45,7 +45,6 @@ /* Environment */ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB env size */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) @@ -81,7 +80,6 @@ /* USB Networking options */ /* CPSW Ethernet */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_SEND_HOSTNAME diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 7089bc4f15..c5bd2ed336 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -11,8 +11,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main @@ -66,8 +64,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_SYS_ALT_MEMTEST - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 4f36930a94..9cf559e04f 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -63,7 +63,6 @@ #define CONFIG_ENV_OFFSET (768 * 1024) #ifndef CONFIG_SPL_BUILD -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 641bdb71e9..0609ccacfe 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -16,7 +16,6 @@ #include <configs/ti_am335x_common.h> #undef CONFIG_SPI -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_MAX_RAM_BANK_SIZE #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index da78519c8e..4bb48175af 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -45,7 +45,6 @@ 50, 51, 52, 53, 54, 55, 56, 57, } /* CPSW Ethernet support */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_SEND_HOSTNAME @@ -84,7 +83,6 @@ #undef CONFIG_SYS_MONITOR_LEN #define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 72db44dd6b..0c372c5e00 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -12,7 +12,6 @@ #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ #define CONFIG_SYS_GENERIC_BOARD @@ -37,10 +36,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* Make the HW version stuff available in U-Boot env */ -#define CONFIG_VERSION_VARIABLE /* ver environment variable */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC @@ -55,7 +50,6 @@ #endif /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 @@ -228,7 +222,6 @@ #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 48 -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 27f44acde6..daa085966b 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -17,10 +17,6 @@ /*#define CONFIG_DBG_MONITOR*/ #define PHYS_SDRAM_SIZE SZ_512M -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ - -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 484483da58..f5f648d7aa 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -20,13 +20,10 @@ /* We will never enable dcache because we have to setup MMU first */ #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ - /* * Environment settings */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_SYS_MALLOC_LEN (128 * 1024) #define CONFIG_ARCH_CPU_INIT #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index e7f9405111..4bd825eedb 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -12,7 +12,6 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 8a4ab6a3e8..3ec91d6b9c 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -14,7 +14,6 @@ #include "tegra30-common.h" /* High-level configuration options */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 1078480f09..4d55c0119a 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ - #define CONFIG_SKIP_LOWLEVEL_INIT #ifdef CONFIG_CMD_FUSE @@ -39,7 +37,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION @@ -50,7 +47,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9261eb418b..1fe6f2fa5e 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -198,7 +198,6 @@ /* * MMC */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #ifndef CONFIG_TRAILBLAZER @@ -255,7 +254,6 @@ /* * Ethernet */ -#define CONFIG_TSEC_ENET #define CONFIG_TSECV2 @@ -317,15 +315,7 @@ /* * Board initialisation callbacks */ -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R -#define CONFIG_LAST_STAGE_INIT - -#else /* CONFIG_TRAILBLAZER */ - -#define CONFIG_BOARD_EARLY_INIT_R -#define CONFIG_LAST_STAGE_INIT - #endif /* CONFIG_TRAILBLAZER */ /* @@ -353,7 +343,7 @@ #else -#define CONFIG_HOSTNAME controlcenterd +#define CONFIG_HOSTNAME "controlcenterd" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index e34b08ed98..1db18a4065 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -14,9 +14,7 @@ #define CONFIG_CUSTOMER_BOARD_SUPPORT #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_BOARD_LATE_INIT -#define CONFIG_LAST_STAGE_INIT /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -73,8 +71,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_SYS_ALT_MEMTEST - /* * Software (bit-bang) MII driver configuration */ @@ -145,7 +141,7 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_HOSTNAME ccdc +#define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "ccdc.img" diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index d325bc9201..2f3c4978ef 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -123,7 +123,6 @@ #define CONFIG_POST CONFIG_SYS_POST_MEMORY /* test POST memory test */ #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -268,7 +267,6 @@ #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -581,7 +579,6 @@ #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index c3b5845532..f0844a47ed 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -82,7 +82,6 @@ #undef CONFIG_POST #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -153,7 +152,6 @@ #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG @@ -404,7 +402,6 @@ #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 25ce0ce4d3..066b7def0e 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -46,8 +45,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -#define CONFIG_SYS_ALT_MEMTEST - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index f039f0b34f..915432ae26 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -11,8 +11,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main @@ -51,8 +49,6 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_ALT_MEMTEST - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index db7346a1b1..bcc919d86d 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -11,8 +11,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main @@ -66,8 +64,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_SYS_ALT_MEMTEST - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 115b593668..f886591159 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -12,8 +12,6 @@ */ #define CONFIG_DB_784MP_GP /* Board target name for DDR training */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main @@ -44,8 +42,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -#define CONFIG_SYS_ALT_MEMTEST - /* SATA support */ #define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 3ee50e23a9..02bf6981e9 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -66,7 +66,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/display5.h b/include/configs/display5.h index 9c8a836bc5..9fa96fed08 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -92,7 +92,6 @@ #endif /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index e82de2a637..13efc3e56e 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -97,7 +97,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_TI diff --git a/include/configs/draco.h b/include/configs/draco.h index c1816409a9..02e935e649 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -18,7 +18,6 @@ #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index ce520b23de..e137c0fd2a 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -42,8 +41,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII -#define CONFIG_SYS_ALT_MEMTEST - /* PCIe support */ #ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_MVEBU diff --git a/include/configs/duovero.h b/include/configs/duovero.h index 96644b1fa6..1fecac2bc8 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -34,6 +34,4 @@ /* ENV related config options */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #endif /* __CONFIG_DUOVERO_H */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 75353cd112..ce1ed5b275 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -151,7 +151,7 @@ * to update uboot and load kernel */ -#define CONFIG_HOSTNAME ea20 +#define CONFIG_HOSTNAME "ea20" #define CONFIG_EXTRA_ENV_SETTINGS \ "as=3\0" \ "netdev=eth0\0" \ @@ -188,9 +188,9 @@ "loadaddr=c0000014\0" \ "memory=32M\0" \ "kernel_addr_r=c0700000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/image.ext2\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/image.ext2\0" \ "flash_self=run ramargs addip addtty addmtd addmisc addmem;" \ "bootm ${kernel_addr_r}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc addmem;" \ @@ -219,7 +219,7 @@ "net_nandrw=tftp ${kernel_addr_r} ${bootfile}; run nandrwargs" \ " addip addtty addmtd addmisc addmem;" \ "clrlogo;bootm ${kernel_addr_r}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load_magic=if sf probe 0;then sf " \ "read c0000000 0x10000 0x60000;fi\0" \ "load_nand=ubi part nand0,${as};ubifsmount ubi:rootfs;" \ diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 63568caa78..16382f6f26 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -26,6 +26,8 @@ #define CONFIG_BOOTFILE "uImage" +#define CONFIG_HOSTNAME "eco5pk" + /* * Set its own mtdparts, different from common */ diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 991cee57f0..35eaec6a46 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -79,7 +79,6 @@ #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 200 * 1024 * 1024) /* Enable alternate, more extensive, memory test */ -#undef CONFIG_SYS_ALT_MEMTEST /* Scratch address used by the alternate memory test */ #undef CONFIG_SYS_MEMTEST_SCRATCH diff --git a/include/configs/edison.h b/include/configs/edison.h index dcfd311f25..3233f6653c 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -10,7 +10,6 @@ #include <asm/ibmpc.h> /* ACPI */ -#define CONFIG_LAST_STAGE_INIT /* Boot */ #define CONFIG_BOOTCOMMAND "run bootcmd" diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 94e0bdf924..e6b6be4ced 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -56,7 +56,6 @@ #define CONFIG_BOARD_NAME EL6Q -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "board="__stringify(CONFIG_BOARD_NAME)"\0" \ "cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \ @@ -82,8 +81,6 @@ #define CONFIG_ARP_TIMEOUT 200UL -#define CONFIG_CMD_MEMTEST - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10800000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 diff --git a/include/configs/etamin.h b/include/configs/etamin.h index ef9f330a09..a605f8d73e 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* FWD Button = 27 * SRV Button = 87 */ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 2ce8720b75..6ca69fb996 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -155,7 +155,7 @@ * to update uboot and load kernel */ -#define CONFIG_HOSTNAME flea3 +#define CONFIG_HOSTNAME "flea3" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -173,9 +173,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -189,7 +189,7 @@ "run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "else echo Images not loades;fi\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 8a0ac618e8..0a6f179612 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -48,8 +48,6 @@ #define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000 -#define CONFIG_LAST_STAGE_INIT - #define CONFIG_MXC_UART #define CONFIG_MXC_OCOTP @@ -63,7 +61,6 @@ #endif /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4845c9fce5..a470bd8f4c 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -24,7 +24,6 @@ #include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 72cded07fd..d6761ddad1 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -18,10 +18,6 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_HRCON 1 /* HRCON board specific */ -#define CONFIG_BOARD_EARLY_INIT_R -#define CONFIG_LAST_STAGE_INIT - -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR /* @@ -469,7 +465,6 @@ void fpga_control_clear(unsigned int bus, int pin); /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_SYS_TSEC1_OFFSET 0x24000 #define CONFIG_SYS_TSEC1 (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET) @@ -583,7 +578,7 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_HOSTNAME hrcon +#define CONFIG_HOSTNAME "hrcon" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index fb4829ab46..f476f5bed7 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -12,6 +12,7 @@ /* * CPU configuration */ +#define NR_CPUS 4 #define ARC_PERIPHERAL_BASE 0xF0000000 #define ARC_DWMMC_BASE (ARC_PERIPHERAL_BASE + 0xA000) #define ARC_DWGMAC_BASE (ARC_PERIPHERAL_BASE + 0x18000) @@ -61,6 +62,50 @@ */ #define CONFIG_ENV_SIZE SZ_16K +#define CONFIG_EXTRA_ENV_SETTINGS \ + "core_dccm_0=0x10\0" \ + "core_dccm_1=0x6\0" \ + "core_dccm_2=0x10\0" \ + "core_dccm_3=0x6\0" \ + "core_iccm_0=0x10\0" \ + "core_iccm_1=0x6\0" \ + "core_iccm_2=0x10\0" \ + "core_iccm_3=0x6\0" \ + "core_mask=0xF\0" \ + "dcache_ena=0x1\0" \ + "icache_ena=0x1\0" \ + "non_volatile_limit=0xE\0" \ + "hsdk_hs34=setenv core_mask 0x2; setenv icache_ena 0x0; \ +setenv dcache_ena 0x0; setenv core_iccm_1 0x7; \ +setenv core_dccm_1 0x8; setenv non_volatile_limit 0x0;\0" \ + "hsdk_hs36=setenv core_mask 0x1; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_0 0x10; \ +setenv core_dccm_0 0x10; setenv non_volatile_limit 0xE;\0" \ + "hsdk_hs36_ccm=setenv core_mask 0x2; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_1 0x7; \ +setenv core_dccm_1 0x8; setenv non_volatile_limit 0xE;\0" \ + "hsdk_hs38=setenv core_mask 0x1; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_0 0x10; \ +setenv core_dccm_0 0x10; setenv non_volatile_limit 0xE;\0" \ + "hsdk_hs38_ccm=setenv core_mask 0x2; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_1 0x7; \ +setenv core_dccm_1 0x8; setenv non_volatile_limit 0xE;\0" \ + "hsdk_hs38x2=setenv core_mask 0x3; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_0 0x10; \ +setenv core_dccm_0 0x10; setenv non_volatile_limit 0xE; \ +setenv core_iccm_1 0x6; setenv core_dccm_1 0x6;\0" \ + "hsdk_hs38x3=setenv core_mask 0x7; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_0 0x10; \ +setenv core_dccm_0 0x10; setenv non_volatile_limit 0xE; \ +setenv core_iccm_1 0x6; setenv core_dccm_1 0x6; \ +setenv core_iccm_2 0x10; setenv core_dccm_2 0x10;\0" \ + "hsdk_hs38x4=setenv core_mask 0xF; setenv icache_ena 0x1; \ +setenv dcache_ena 0x1; setenv core_iccm_0 0x10; \ +setenv core_dccm_0 0x10; setenv non_volatile_limit 0xE; \ +setenv core_iccm_1 0x6; setenv core_dccm_1 0x6; \ +setenv core_iccm_2 0x10; setenv core_dccm_2 0x10; \ +setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0" + /* * Environment configuration */ @@ -68,12 +113,16 @@ #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR /* - * Console configuration + * Misc utility configuration */ +#define CONFIG_BOUNCE_BUFFER + +/* Cli configuration */ +#define CONFIG_SYS_CBSIZE SZ_2K /* - * Misc utility configuration + * Callback configuration */ -#define CONFIG_BOUNCE_BUFFER +#define CONFIG_BOARD_LATE_INIT #endif /* _CONFIG_HSDK_H_ */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index e107109c2d..a10dc123f2 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -162,7 +162,6 @@ */ #define CONFIG_TSEC1 #define CONFIG_TSEC2 -#define CONFIG_TSEC_ENET #define CONFIG_HARD_SPI /* @@ -427,7 +426,7 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_NETDEV eth1 -#define CONFIG_HOSTNAME ids8313 +#define CONFIG_HOSTNAME "ids8313" #define CONFIG_ROOTPATH "/opt/eldk-4.2/ppc_6xx" #define CONFIG_BOOTFILE "ids8313/uImage" #define CONFIG_UBOOTPATH "ids8313/u-boot.bin" diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 475461471f..ad9aca4cf3 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -150,9 +150,9 @@ " console=ttymxc0,${baudrate}\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "addmisc=setenv bootargs ${bootargs}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "kernel_addr_r=a0800000\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ "rootpath=/opt/eldk-4.2-arm/arm\0" \ "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ "run nfsargs addip addtty addmtd addmisc;" \ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 1bc7f2ac42..bfc9b33e8c 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -28,8 +28,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index f00ca1c233..b14f6c5422 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -16,8 +16,6 @@ /* Platform type */ #define CONFIG_SOC_K2G -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_MMC_TI_ARGS \ diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 61890d3621..cf3fc438df 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -23,8 +23,6 @@ #define CONFIG_HUSH_INIT_VAR -#define CONFIG_SYS_ALT_MEMTEST /* memory test, takes time */ - #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } #define CONFIG_LOADS_ECHO diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 64c1d2ff7e..c4d4b0c0fa 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -9,8 +9,6 @@ #define __CONFIG_KEYMILE_POWERPC_H /* Do boardspecific init for all boards */ -#define CONFIG_BOARD_EARLY_INIT_R -#define CONFIG_LAST_STAGE_INIT #define CONFIG_JFFS2_CMDLINE @@ -67,7 +65,7 @@ #define CONFIG_KM_DEF_BOOT_ARGS_CPU "" #define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0" \ "update=" \ "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ "erase " __stringify(BOOTFLASH_START) " +${filesize} && "\ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 379224dde4..c6761921c7 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -69,7 +69,7 @@ " boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}" #define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.kwb\0" \ CONFIG_KM_UPDATE_UBOOT \ "set_fdthigh=setenv fdt_high ${kernelmem}\0" \ "checkfdt=" \ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 89e18c514a..05a4e86511 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -188,10 +188,8 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_BR1_PRELIM CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */ #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */ -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_LAST_STAGE_INIT #define CONFIG_HWCONFIG @@ -393,7 +391,7 @@ int get_scl(void); "cramfsload ${fdt_addr_r} " \ "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.pbl\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.pbl\0" \ "update=" \ "sf probe 0;sf erase 0 +${filesize};" \ "sf write ${load_addr_r} 0 ${filesize};\0" \ diff --git a/include/configs/km8360.h b/include/configs/km8360.h index 7d4b43068b..280da9d6cc 100644 --- a/include/configs/km8360.h +++ b/include/configs/km8360.h @@ -14,11 +14,11 @@ #define CONFIG_SYS_KMBEC_FPGA_SIZE 64 #if defined CONFIG_KMETER1 -#define CONFIG_HOSTNAME kmeter1 +#define CONFIG_HOSTNAME "kmeter1" #define CONFIG_KM_BOARD_NAME "kmeter1" #define CONFIG_KM_DEF_NETDEV "netdev=eth2\0" #elif defined CONFIG_KMCOGE5NE -#define CONFIG_HOSTNAME kmcoge5ne +#define CONFIG_HOSTNAME "kmcoge5ne" #define CONFIG_KM_BOARD_NAME "kmcoge5ne" #define CONFIG_KM_DEF_NETDEV "netdev=eth1\0" #define CONFIG_NAND_ECC_BCH diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 0d78cfaed6..15e4b46625 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -23,13 +23,13 @@ /* KM_KIRKWOOD */ #if defined(CONFIG_KM_KIRKWOOD) -#define CONFIG_HOSTNAME km_kirkwood +#define CONFIG_HOSTNAME "km_kirkwood" #define CONFIG_KM_DISABLE_PCIE #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ /* KM_KIRKWOOD_PCI */ #elif defined(CONFIG_KM_KIRKWOOD_PCI) -#define CONFIG_HOSTNAME km_kirkwood_pci +#define CONFIG_HOSTNAME "km_kirkwood_pci" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #define CONFIG_KM_FPGA_CONFIG #define CONFIG_KM_UBI_PART_BOOT_OPTS ",2048" @@ -37,7 +37,7 @@ /* KM_KIRKWOOD_128M16 */ #elif defined(CONFIG_KM_KIRKWOOD_128M16) -#define CONFIG_HOSTNAME km_kirkwood_128m16 +#define CONFIG_HOSTNAME "km_kirkwood_128m16" #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg #define CONFIG_KM_DISABLE_PCIE @@ -48,9 +48,9 @@ #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ # if defined(CONFIG_KM_NUSA) -#define CONFIG_HOSTNAME kmnusa +#define CONFIG_HOSTNAME "kmnusa" # elif defined(CONFIG_KM_SUGP1) -#define CONFIG_HOSTNAME kmsugp1 +#define CONFIG_HOSTNAME "kmsugp1" #define KM_PCIE_RESET_MPP7 #endif @@ -64,7 +64,7 @@ /* KM_MGCOGE3UN */ #elif defined(CONFIG_KM_MGCOGE3UN) -#define CONFIG_HOSTNAME mgcoge3un +#define CONFIG_HOSTNAME "mgcoge3un" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-memphis.cfg @@ -80,20 +80,20 @@ #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg #define CONFIG_KM_ENV_IS_IN_SPI_NOR #define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3 -#define CONFIG_HOSTNAME kmcoge5un +#define CONFIG_HOSTNAME "kmcoge5un" #define CONFIG_KM_DISABLE_PCIE #define CONFIG_KM_PIGGY4_88E6352 /* KM_PORTL2 */ #elif defined(CONFIG_KM_PORTL2) -#define CONFIG_HOSTNAME portl2 +#define CONFIG_HOSTNAME "portl2" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #define CONFIG_KM_PIGGY4_88E6061 /* KM_SUV31 */ #elif defined(CONFIG_KM_SUV31) #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_HOSTNAME kmsuv31 +#define CONFIG_HOSTNAME "kmsuv31" #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg #define CONFIG_KM_ENV_IS_IN_SPI_NOR diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h index 8bb3571691..37a33e5ae0 100644 --- a/include/configs/kmp204x.h +++ b/include/configs/kmp204x.h @@ -10,12 +10,12 @@ /* KMLION1 */ #if defined(CONFIG_KMLION1) -#define CONFIG_HOSTNAME kmlion1 +#define CONFIG_HOSTNAME "kmlion1" #define CONFIG_KM_BOARD_NAME "kmlion1" /* KMCOGE4 */ #elif defined(CONFIG_KMCOGE4) -#define CONFIG_HOSTNAME kmcoge4 +#define CONFIG_HOSTNAME "kmcoge4" #define CONFIG_KM_BOARD_NAME "kmcoge4" #else diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 82984f4d17..179c7603f2 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MEMTEST_START (KZM_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END \ (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024)) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index dbb0fcc62b..7664b96ec2 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -15,13 +15,11 @@ #define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif @@ -39,7 +37,6 @@ #define CONFIG_NET_MULTI #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 0f8033f5b4..91e6da03b1 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -13,8 +13,6 @@ #include <asm/arch/config.h> #include <asm/arch/stream_id_lsch2.h> -#define CONFIG_DISPLAY_BOARDINFO_LATE - #define CONFIG_SYS_CLK_FREQ 125000000 #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 7c080a0cd3..6bb6927039 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_SDRAM_SIZE 0x20000000 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff @@ -71,7 +70,6 @@ #define CONFIG_BOOTCOMMAND "pfe stop;run distro_bootcmd;run qspi_bootcmd" #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index e1767efa35..3829f1ad28 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -15,7 +15,6 @@ #define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff @@ -109,7 +108,6 @@ /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif @@ -118,7 +116,6 @@ #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 442c95eb14..e24d261d88 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -15,7 +15,6 @@ #define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff @@ -46,7 +45,6 @@ /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif @@ -56,7 +54,6 @@ #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 88f44ca5fc..f2a6837324 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -117,7 +117,6 @@ * MMC */ #define CONFIG_CMD_MMC -#define CONFIG_FSL_ESDHC /* SATA */ #define CONFIG_SCSI_AHCI_PLAT @@ -153,7 +152,6 @@ /* * eTSEC */ -#define CONFIG_TSEC_ENET #ifdef CONFIG_TSEC_ENET #define CONFIG_MII diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5f59f1ea15..d0924109d5 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -362,7 +362,6 @@ unsigned long get_board_ddr_clk(void); /* * MMC */ -#define CONFIG_FSL_ESDHC /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) @@ -396,7 +395,6 @@ unsigned long get_board_ddr_clk(void); /* * eTSEC */ -#define CONFIG_TSEC_ENET #ifdef CONFIG_TSEC_ENET #define CONFIG_MII diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 5c4da8d900..c11f454b20 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -237,7 +237,6 @@ /* * MMC */ -#define CONFIG_FSL_ESDHC /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) @@ -269,7 +268,6 @@ /* * eTSEC */ -#define CONFIG_TSEC_ENET #ifdef CONFIG_TSEC_ENET #define CONFIG_MII diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 687e987d75..790db150ce 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -169,7 +169,6 @@ /* MMC */ #ifndef SPL_NO_MMC #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif #endif diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index e1ad927f31..7d67f10d40 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -157,7 +157,6 @@ /* MMC */ #ifndef SPL_NO_MMC #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif #endif diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 34f991caa5..88c58163fe 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -10,9 +10,6 @@ #include "ls1088a_common.h" -#define CONFIG_DISPLAY_BOARDINFO_LATE - - #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); unsigned long get_board_ddr_clk(void); @@ -348,7 +345,6 @@ unsigned long get_board_ddr_clk(void); #endif #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff @@ -361,7 +357,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_MEMAC /* MMC */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \ QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER) diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 3f2a00820a..c92cb72601 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -9,10 +9,6 @@ #include "ls1088a_common.h" -#ifndef SPL_NO_BOARDINFO -#define CONFIG_DISPLAY_BOARDINFO_LATE -#endif - #define CONFIG_MISC_INIT_R #if defined(CONFIG_QSPI_BOOT) @@ -292,7 +288,6 @@ #endif #define CONFIG_CMD_MEMINFO -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff @@ -457,7 +452,6 @@ /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index dad1090f84..aff319bd72 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -133,7 +133,6 @@ /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 815d8adc92..213a5a5b91 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -343,7 +343,6 @@ unsigned long get_board_ddr_clk(void); /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 5033008ca7..012c24f88e 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -322,7 +322,6 @@ unsigned long get_board_sys_clk(void); /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index d44cf786d7..9c4d01e1d1 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -97,7 +97,7 @@ /* Extra Environment */ #define CONFIG_PREBOOT "run try_bootscript" -#define CONFIG_HOSTNAME m28evk +#define CONFIG_HOSTNAME "m28evk" #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttyAMA0\0" \ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 171056db54..0ef9929b88 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -55,7 +55,6 @@ * MMC Driver */ #ifdef CONFIG_CMD_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 #endif @@ -185,7 +184,7 @@ * Extra Environments */ #define CONFIG_PREBOOT "run try_bootscript" -#define CONFIG_HOSTNAME m53evk +#define CONFIG_HOSTNAME "m53evk" #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttymxc1\0" \ diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index ed95e580c0..a00af1a1fb 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -86,7 +86,6 @@ * SPI NOR (boot memory) */ #ifdef CONFIG_CMD_SF -#define CONFIG_ATMEL_SPI #define CONFIG_ATMEL_SPI0 #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 @@ -119,7 +118,7 @@ * Extra Environments */ #define CONFIG_PREBOOT "run try_bootscript" -#define CONFIG_HOSTNAME ma5d4evk +#define CONFIG_HOSTNAME "ma5d4evk" #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttyS3\0" \ diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 4593145901..93597db236 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -42,8 +41,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -#define CONFIG_SYS_ALT_MEMTEST - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 8eb248ac89..0aa797aa60 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -94,7 +94,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \ "fdtfile=imx6q-mccmon6.dtb\0" \ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 045f602837..27098eca73 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -106,7 +106,7 @@ /* Setup MTD for NAND on the SOM */ -#define CONFIG_HOSTNAME mcx +#define CONFIG_HOSTNAME "mcx" #define CONFIG_EXTRA_ENV_SETTINGS \ "adddbg=setenv bootargs ${bootargs} trace_buf_size=64M\0" \ "adddebug=setenv bootargs ${bootargs} earlyprintk=serial\0" \ @@ -125,13 +125,13 @@ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "baudrate=115200\0" \ "consoledev=ttyO2\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ "loadaddr=0x82000000\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "load_k=tftp ${loadaddr} ${bootfile}\0" \ "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \ "loadmlo=tftp ${loadaddr} ${mlo}\0" \ - "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \ + "mlo=" CONFIG_HOSTNAME "/MLO\0" \ "mmcargs=root=/dev/mmcblk0p2 rw " \ "rootfstype=ext3 rootwait\0" \ "mmcboot=echo Booting from mmc ...; " \ @@ -145,7 +145,7 @@ "bootm ${loadaddr}\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.img\0" \ "uboot_addr=0x80000\0" \ "update=nandecc sw;nand erase ${uboot_addr} 100000;" \ "nand write ${loadaddr} ${uboot_addr} 80000\0" \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 73c3c2ae48..1a02ff5e09 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -179,7 +179,7 @@ /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0 -#define CONFIG_HOSTNAME XILINX_BOARD_NAME +#define CONFIG_HOSTNAME "microblaze-generic" #define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm" /* architecture dependent code */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 87afe3f9bb..2b7b600cf7 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -330,7 +330,6 @@ /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_SYS_TSEC1_OFFSET 0x24000 #define CONFIG_SYS_TSEC1 (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET) #define CONFIG_SYS_TSEC2_OFFSET 0x25000 diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 5ba10b8648..687f8ff1ef 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024)) -#undef CONFIG_SYS_ALT_MEMTEST /* Enable alternate, more extensive, memory test */ #undef CONFIG_SYS_MEMTEST_SCRATCH /* Scratch address used by the alternate memory test */ #undef CONFIG_SYS_LOADS_BAUD_CHANGE /* Enable temporary baudrate change while serial download */ diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 710994988e..3810fd948f 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -23,7 +23,7 @@ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_HOSTNAME mt_ventoux +#define CONFIG_HOSTNAME "mt_ventoux" /* * Set its own mtdparts, different from common diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index a2f68ad70a..f6ac035549 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -45,6 +45,4 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_MARVELL_PLUG_H */ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 52f8c5d711..f4647b0b03 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 @@ -49,8 +48,6 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#define CONFIG_SYS_ALT_MEMTEST - /* End of 16M scrubbed by training in bootrom */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000) diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 1cd0fa93d3..44ec7025fb 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -12,8 +12,6 @@ */ #define CONFIG_SYS_TCLK 250000000 /* 250MHz */ -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 @@ -51,8 +49,6 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#define CONFIG_SYS_ALT_MEMTEST - /* End of 16M scrubbed by training in bootrom */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000) diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 6c603ead91..a929d9f731 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -67,7 +67,6 @@ #define CONFIG_ENV_OVERWRITE /* ESDHC driver */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR IMX_MMC_SDHC1_BASE #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 23cb64ea46..3aefe5b862 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -180,7 +180,6 @@ #define CONFIG_MXC_USB_PORTSC (MXC_EHCI_UTMI_16BIT | MXC_EHCI_MODE_UTMI) /* mmc driver */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 @@ -208,9 +207,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -220,7 +219,7 @@ "bootm ${kernel_addr_r}\0" \ "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \ "tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 8a5b1c4f97..173cb5c48f 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -50,7 +50,6 @@ /* * MMC Configs * */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 43cb97c8cf..733f59cdad 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index c3f5f5740a..091443933c 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -31,7 +31,6 @@ #define CONFIG_FPGA_COUNT 1 /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 8703a61556..087fc5f3e0 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -42,7 +42,6 @@ #define CONFIG_RTC_MC13XXX /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index dfa1cdffab..b96483b2b4 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -29,7 +29,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 5b973bb2ff..bd28515e3a 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -35,7 +35,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index dadc7b49ef..0a3578f27c 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 3245f001e8..fadadb3d1b 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -60,7 +60,6 @@ /* MMC */ #define CONFIG_BOUNCE_BUFFER -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC /* Fuses */ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 0e1d18cad8..9fbd162d8f 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -71,7 +71,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 1 #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "fdtfile=undefined\0" \ diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index 5be8ce419d..5325ec1310 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -14,7 +14,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#undef CONFIG_FSL_ESDHC #undef CONFIG_MMC #undef CONFIG_SPL_MMC_SUPPORT #undef CONFIG_GENERIC_MMC diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index d976e77aef..6f970a41ef 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -57,8 +57,6 @@ #define EMMC_ENV "" #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 1eaaf013f7..713ebf6ac1 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -43,7 +43,6 @@ #define UPDATE_M4_ENV "" #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ "script=boot.scr\0" \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 1c1671e30f..733538f2ee 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -18,8 +18,6 @@ /* SPL options */ #include "imx6_spl.h" -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 21429134ba..cf9f8abedf 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -22,8 +22,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index ef76c2f450..000b305cce 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -45,7 +45,6 @@ /* MMC */ #define CONFIG_BOUNCE_BUFFER -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC /* Fuses */ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 9c58c29489..c2223bd858 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -29,7 +29,6 @@ #define IOMUXC_BASE_ADDR IOMUXC1_RBASE #define CONFIG_BOUNCE_BUFFER -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ @@ -85,7 +84,6 @@ #define CONFIG_LOADADDR 0x60800000 -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_END 0x9E000000 #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c73cfb7f7e..7d2cf0bd8c 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -268,8 +268,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif -#define CONFIG_SYS_ALT_MEMTEST - /* * PCI express */ diff --git a/include/configs/novena.h b/include/configs/novena.h index 977b2c3643..121d339a16 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -37,7 +37,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_HOSTNAME novena +#define CONFIG_HOSTNAME "novena" /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 3b673827bd..ddc36df4cd 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -19,8 +19,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_DISPLAY_BOARDINFO_LATE - /* I2C */ #define CONFIG_SYS_I2C_TEGRA diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 2c8ee7a7fe..8faa7a33fc 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -185,7 +185,6 @@ * TODO: Add Odroid X support */ #define CONFIG_MISC_COMMON -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_BOARD_TYPES #define CONFIG_MISC_INIT_R diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 9067ba6893..53edd23bdb 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -88,7 +88,6 @@ #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_ODROID_REV_AIN 9 #define CONFIG_REVISION_TAG #define CONFIG_BOARD_TYPES diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index c9a154cc80..162b05d505 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -153,10 +153,10 @@ "run loadramdisk\0" \ "mmcramboot=setenv bootfile uImage; " \ "run mmcrambootcommon; " \ - "bootm ${loadaddr} ${rdaddr} ${fdtimage}\0" \ + "bootm ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ "mmcrambootz=setenv bootfile zImage; " \ "run mmcrambootcommon; " \ - "bootz ${loadaddr} ${rdaddr} ${fdtimage}\0" \ + "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \ "run ramargs; " \ "run common_bootargs; " \ diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 75203b291c..8cded9996e 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -30,7 +30,6 @@ /* ENV related config options */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_ENV_OVERWRITE #endif /* __CONFIG_PANDA_H */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a2921fd632..a9752ad7f6 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -233,7 +233,6 @@ #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_SATA_MAX_DEVICE 2 @@ -427,8 +426,6 @@ #endif #endif /* CONFIG_NAND_FSL_ELBC */ -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ #ifdef CONFIG_PHYS_64BIT @@ -779,7 +776,6 @@ #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -805,7 +801,7 @@ /* * Environment Configuration */ -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 964d2dbc97..623b238d4c 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -42,7 +42,6 @@ #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_SATA_MAX_DEVICE 2 @@ -166,8 +165,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */ @@ -372,7 +369,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -394,7 +390,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 411403e8fd..4f72350138 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -25,7 +25,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_PCM051 /* set to negative value for no autoboot */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80007fc0\0" \ "fdtaddr=0x80000000\0" \ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 94f580d359..17600f5550 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -37,7 +37,6 @@ #endif -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 0bd19b6657..9481e5b5c5 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -27,7 +27,6 @@ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) /* Early setup */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Size of malloc() pool */ diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 74bfde7222..545f859e85 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -22,8 +22,6 @@ /* set env size */ #define CONFIG_ENV_SIZE 0x4000 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ diff --git a/include/configs/pepper.h b/include/configs/pepper.h index f0ffc518c3..44dcfba673 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -20,7 +20,6 @@ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "bootdir=/boot\0" \ diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index 86d875dccf..e3c1191817 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -25,7 +25,6 @@ #define CONSOLE_DEV "ttymxc3" /* Early setup */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Size of malloc() pool */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 4b18b2c90b..88c74bd7d1 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -30,7 +30,6 @@ /* MMC Configs */ #define CONFIG_FSL_USDHC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h index 20315546aa..148e561ed0 100644 --- a/include/configs/platinum_picon.h +++ b/include/configs/platinum_picon.h @@ -16,7 +16,7 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_HOSTNAME picon +#define CONFIG_HOSTNAME "picon" #define CONFIG_PLATFORM_ENV_SETTINGS "\0" diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h index 09b9bd38ff..362d3a4143 100644 --- a/include/configs/platinum_titanium.h +++ b/include/configs/platinum_titanium.h @@ -21,7 +21,7 @@ #define CONFIG_PHY_RESET_DELAY 1000 -#define CONFIG_HOSTNAME titanium +#define CONFIG_HOSTNAME "titanium" #define CONFIG_PLATFORM_ENV_SETTINGS "\0" diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index ca4b6ec592..7b97ad56a5 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* Needed to fill the ccsrbar pointer */ @@ -113,8 +112,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_LAST_STAGE_INIT - /* * Command line configuration. */ diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index c14b4d2648..c5cb657afb 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 100 * 1024 * 1024) /* Enable alternate, more extensive, memory test */ -#undef CONFIG_SYS_ALT_MEMTEST /* Scratch address used by the alternate memory test */ #undef CONFIG_SYS_MEMTEST_SCRATCH diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 116728fc22..a9304e8d77 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -16,7 +16,6 @@ #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* FWD Button = 27 * SRV Button = 87 */ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 26d41b5075..2c94319d78 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -58,6 +58,4 @@ #endif -#define CONFIG_DISPLAY_BOARDINFO_LATE - #endif /* _ROCKCHIP_COMMON_H_ */ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 17cdecd1c3..325e52a019 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -86,7 +86,6 @@ #define CONFIG_INITRD_TAG /* Environment */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define ENV_DEVICE_SETTINGS \ "stdin=serial,usbkbd\0" \ "stdout=serial,vidconsole\0" \ diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 4dc098b828..34e8441ea0 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -69,7 +69,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_UART_PORT (1) -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_NUM 1 @@ -156,7 +155,6 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_PROMPT "=> " -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START (DDR_BASE_ADDR) #define CONFIG_SYS_MEMTEST_END (DDR_BASE_ADDR + 0x7C00000) diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 1b40c29a55..40f037e06d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -103,7 +103,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_UPDATEB \ "updatek=" \ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 841deddbe8..410d20bd89 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -71,8 +71,6 @@ #define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}" -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #define CONFIG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x100000;" \ diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 843aaa6394..be19d8dced 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -15,8 +15,6 @@ #include "at91-sama5_common.h" -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* * This needs to be defined for the OHCI code to work but it is defined as * ATMEL_ID_UHPHS in the CPU specific header files. diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2b902310f5..4961301765 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* turn on command-line edit/c/auto */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index c0b2aa707a..73a2d190af 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -338,7 +338,6 @@ /* * TSEC configuration */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #if defined(CONFIG_TSEC_ENET) @@ -598,7 +597,7 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_HOSTNAME SBC8349 +#define CONFIG_HOSTNAME "SBC8349" #define CONFIG_ROOTPATH "/tftpboot/rootfs" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 5ef452a75d..51c0ad65b1 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -53,7 +53,6 @@ #define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ #endif -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ @@ -521,7 +520,7 @@ #define CONFIG_IPADDR 192.168.0.55 -#define CONFIG_HOSTNAME sbc8548 +#define CONFIG_HOSTNAME "sbc8548" #define CONFIG_ROOTPATH "/opt/eldk/ppc_85xx" #define CONFIG_BOOTFILE "/uImage" #define CONFIG_UBOOTPATH /u-boot.bin /* TFTP server */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 44b6da3222..5f0a955632 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -44,7 +44,6 @@ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ @@ -480,7 +479,7 @@ #define CONFIG_IPADDR 192.168.0.50 -#define CONFIG_HOSTNAME sbc8641d +#define CONFIG_HOSTNAME "sbc8641d" #define CONFIG_ROOTPATH "/opt/eldk/ppc_74xx" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 9d5950937e..e192de0623 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MEMTEST_START (SH7752EVB_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ 480 * 1024 * 1024) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index fee8059651..c17bc310bb 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MEMTEST_START (SH7753EVB_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ 480 * 1024 * 1024) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index c750666052..6ca13aa5f8 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_MEMTEST_START (SH7757LCR_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ 224 * 1024 * 1024) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index b175a6f69d..8d36262338 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ (SH7785LCR_SDRAM_SIZE) - \ 4 * 1024 * 1024) -#undef CONFIG_SYS_ALT_MEMTEST #undef CONFIG_SYS_MEMTEST_SCRATCH #undef CONFIG_SYS_LOADS_BAUD_CHANGE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b23e20a563..dfa7114e39 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -192,7 +192,6 @@ # define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #endif /* SPI support */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index a3b1773059..0da3b3b055 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -64,8 +64,6 @@ #define CONFIG_ATMEL_LCD #define CONFIG_GURNARD_SPLASH -#define CONFIG_ATMEL_SPI - /* GPIOs and IO expander */ #define CONFIG_ATMEL_LEGACY #define CONFIG_AT91_GPIO diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 7833f17cf4..6385357b22 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -12,7 +12,6 @@ /* * High level configuration */ -#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_CLOCKS #define CONFIG_SYS_BOOTMAPSZ (64 * 1024 * 1024) diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 1197b40b58..1d8aed90ce 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -41,7 +41,7 @@ #endif /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_vining_fpga +#define CONFIG_HOSTNAME "socfpga_vining_fpga" /* * Active LOW GPIO buttons: diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 29e6c685a7..2ec55c1315 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -22,10 +22,7 @@ #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_TSEC_ENET /* tsec ethernet support */ - #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ -#define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_r */ /* * Only possible on E500 Version 2 or newer cores. diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index aae2cb8301..da0e259736 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -18,7 +18,6 @@ */ #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_ARCH_TIMER -#define CONFIG_SYS_HZ_CLOCK 64000000 /* * malloc() pool size @@ -71,6 +70,7 @@ /*MMC SD*/ #define CONFIG_SYS_MMC_MAX_DEVICE 3 +#define CONFIG_SUPPORT_EMMC_BOOT #if !defined(CONFIG_SPL) || !defined(CONFIG_SPL_BUILD) @@ -81,6 +81,12 @@ #include <config_distro_bootcmd.h> +#define STM32MP_PREBOOT \ + "echo \"Boot over ${boot_device}${boot_instance}!\"; " \ + "if test \"${boot_device}\" = \"mmc\"; then " \ + "env set boot_targets \"mmc${boot_instance}\"; "\ + "fi;" + #define CONFIG_EXTRA_ENV_SETTINGS \ "scriptaddr=0xC0000000\0" \ "pxefile_addr_r=0xC0000000\0" \ @@ -89,6 +95,7 @@ "ramdisk_addr_r=0xC4100000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "preboot=" STM32MP_PREBOOT "\0" \ BOOTENV #endif /* ifndef CONFIG_SPL_BUILD */ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index d20dd9c3c5..c02fe2a963 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -9,7 +9,7 @@ #ifndef __STMARK2_CONFIG_H #define __STMARK2_CONFIG_H -#define CONFIG_HOSTNAME stmark2 +#define CONFIG_HOSTNAME "stmark2" #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT 0 diff --git a/include/configs/strider.h b/include/configs/strider.h index f8f4f0f13c..b56a03e4e6 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -18,14 +18,8 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_STRIDER 1 /* STRIDER board specific */ -#define CONFIG_BOARD_EARLY_INIT_R -#define CONFIG_LAST_STAGE_INIT - -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_SYS_ALT_MEMTEST - /* * System Clock Setup */ @@ -503,7 +497,6 @@ void fpga_control_clear(unsigned int bus, int pin); /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_SYS_TSEC1_OFFSET 0x24000 #define CONFIG_SYS_TSEC1 (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET) @@ -617,7 +610,7 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_HOSTNAME hrcon +#define CONFIG_HOSTNAME "hrcon" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h index 606a4fc13f..a1d03acf25 100644 --- a/include/configs/suvd3.h +++ b/include/configs/suvd3.h @@ -24,13 +24,13 @@ /* This needs to be set prior to including km/km83xx-common.h */ #if defined(CONFIG_SUVD3) /* SUVD3 board specific */ -#define CONFIG_HOSTNAME suvd3 +#define CONFIG_HOSTNAME "suvd3" #define CONFIG_KM_BOARD_NAME "suvd3" /* include common defines/options for all 8321 Keymile boards */ #include "km/km8321-common.h" #elif defined(CONFIG_KMVECT1) /* VECT1 board specific */ -#define CONFIG_HOSTNAME kmvect1 +#define CONFIG_HOSTNAME "kmvect1" #define CONFIG_KM_BOARD_NAME "kmvect1" /* at end of uboot partition, before env */ #define CONFIG_SYS_QE_FW_ADDR 0xF00B0000 @@ -38,7 +38,7 @@ #include "km/km8309-common.h" #elif defined(CONFIG_KMTEGR1) /* TEGR1 board specific */ -#define CONFIG_HOSTNAME kmtegr1 +#define CONFIG_HOSTNAME "kmtegr1" #define CONFIG_KM_BOARD_NAME "kmtegr1" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index faea33978f..aed72ff8a6 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -#define CONFIG_SYS_ALT_MEMTEST /* * Config the L3 Cache as L3 SRAM @@ -93,7 +92,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -#define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_R #define CONFIG_HWCONFIG diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 72da301436..7f5a3cadcb 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -214,8 +214,8 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=82000000\0" \ "kernel_addr_r=82000000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -230,10 +230,10 @@ "run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "else echo Images not loades;fi\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.img\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "loadmlo=tftp ${loadaddr} ${mlo}\0" \ - "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \ + "mlo=" CONFIG_HOSTNAME "/MLO\0" \ "uboot_addr=0x80000\0" \ "update=nandecc sw;nand erase ${uboot_addr} 100000;" \ "nand write ${loadaddr} ${uboot_addr} 80000\0" \ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 8038c9f859..6e04e6b509 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -139,7 +139,6 @@ /* turn on command-line edit/hist/auto */ -#define CONFIG_SYS_ALT_MEMTEST 1 #define CONFIG_SYS_MEMTEST_START (0x82000000) /* memtest */ /* defaults */ #define CONFIG_SYS_MEMTEST_END (0x83FFFFFF) /* 64MB */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 51e3987ab3..f138bd2238 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -118,7 +118,6 @@ /* SPI EEPROM */ #define CONFIG_SPI -#define CONFIG_ATMEL_SPI #define TAURUS_SPI_MASK (1 << 4) #define TAURUS_SPI_CS_PIN AT91_PIN_PA3 diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index e4ec2c00f8..3c2691f952 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -10,7 +10,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -54,7 +53,6 @@ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT /* Keep device tree and initrd in lower memory so the kernel can access them */ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 78674a14c8..88dce5472a 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -16,7 +16,6 @@ #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 2f9056cad8..a81f3b8201 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -28,7 +28,6 @@ /* commands to include */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x80F80000\0" \ @@ -155,7 +154,6 @@ #endif /* Ethernet */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 8251ceb63f..83e26dbb6e 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -15,7 +15,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ -#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #include <asm/arch/omap.h> @@ -36,7 +35,6 @@ #define CONFIG_MII /* Required in net/eth.c */ #endif -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ /* * SPL related defines. The Public RAM memory map the ROM defines the * area between 0x402F0400 and 0x4030B800 as a download area and diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 539164177b..d6ea17bec4 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -58,7 +58,6 @@ #include <environment/ti/boot.h> #include <environment/ti/mmc.h> -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 0fe40ee72f..b53ddacd88 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -54,17 +54,17 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (500 << 20)) -#define CONFIG_HOSTNAME titanium +#define CONFIG_HOSTNAME "titanium" #define CONFIG_UBI_PART ubi #define CONFIG_UBIFS_VOLUME rootfs0 #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "kernel=" CONFIG_HOSTNAME "/uImage\0" \ "kernel_fs=/boot/uImage\0" \ "kernel_addr=11000000\0" \ - "dtb=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "dtb=" CONFIG_HOSTNAME "/" \ + CONFIG_HOSTNAME ".dtb\0" \ + "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0" \ "dtb_addr=12800000\0" \ "script=boot.scr\0" \ "uimage=uImage\0" \ @@ -93,7 +93,7 @@ "rootpath=/opt/eldk-5.3/armv7a/rootfs-minimal-mtdutils\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ - "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \ + "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0" \ "part=" __stringify(CONFIG_UBI_PART) "\0" \ "boot_vol=0\0" \ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \ diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 9e8409ba57..38be08632f 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -43,7 +43,6 @@ /* FPGA commands that we don't use */ /* Extras */ -#define CONFIG_CMD_MEMTEST #undef CONFIG_SYS_MEMTEST_START #define CONFIG_SYS_MEMTEST_START 0 #undef CONFIG_SYS_MEMTEST_END diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 15b4ada3dc..ad90beed97 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -57,7 +57,6 @@ */ #define CONFIG_SYS_MEMTEST_START 0x80100000 #define CONFIG_SYS_MEMTEST_END 0x83f00000 -#define CONFIG_CMD_MEMTEST #define CONFIG_CMD_MII diff --git a/include/configs/trats.h b/include/configs/trats.h index e6649fffa2..e892b59311 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -57,8 +57,6 @@ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* Tizen - partitions definitions */ #define PARTS_CSA "csa-mmc" #define PARTS_BOOT "boot" diff --git a/include/configs/trats2.h b/include/configs/trats2.h index c3eb7c95fe..aecac077e4 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -52,8 +52,6 @@ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* Tizen - partitions definitions */ #define PARTS_CSA "csa-mmc" #define PARTS_BOOT "boot" diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 87eb9ac281..9e7fadb2fa 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -264,6 +264,5 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x80208000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_SCRATCH 0x81000000 #endif /* __CONFIG_H */ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 2fe57e4846..2a8663f55b 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -51,7 +51,6 @@ /* * MMC Configs * */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR /* diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 94a3be63fe..27ce047f7d 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -13,7 +13,6 @@ */ #define CONFIG_MISC_INIT_R -#define CONFIG_DISPLAY_BOARDINFO_LATE /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed @@ -75,8 +74,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_SYS_ALT_MEMTEST - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index b63bdf1a05..bb1d1dbffa 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -26,19 +26,19 @@ */ #if defined(CONFIG_KMSUPX5) #define CONFIG_KM_BOARD_NAME "kmsupx5" -#define CONFIG_HOSTNAME kmsupx5 +#define CONFIG_HOSTNAME "kmsupx5" #elif defined(CONFIG_TUGE1) #define CONFIG_KM_BOARD_NAME "tuge1" -#define CONFIG_HOSTNAME tuge1 +#define CONFIG_HOSTNAME "tuge1" #elif defined(CONFIG_TUXX1) /* TUXX1 board (tuxa1/tuda1) specific */ #define CONFIG_KM_BOARD_NAME "tuxx1" -#define CONFIG_HOSTNAME tuxx1 +#define CONFIG_HOSTNAME "tuxx1" #elif defined(CONFIG_KMOPTI2) #define CONFIG_KM_BOARD_NAME "kmopti2" -#define CONFIG_HOSTNAME kmopti2 +#define CONFIG_HOSTNAME "kmopti2" #elif defined(CONFIG_KMTEPR2) #define CONFIG_KM_BOARD_NAME "kmtepr2" -#define CONFIG_HOSTNAME kmtepr2 +#define CONFIG_HOSTNAME "kmtepr2" #else #error ("Board not supported") #endif diff --git a/include/configs/twister.h b/include/configs/twister.h index 5626eb1b95..032559633b 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -22,7 +22,7 @@ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_HOSTNAME twister +#define CONFIG_HOSTNAME "twister" #define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \ "bootcmd=run nandboot\0" diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 989014a177..dd86deeb12 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -46,8 +46,6 @@ /* MMC Configuration */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 35a6eca9f6..7e6b98041e 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC2*/ /* Linux only */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 492aeb4ca3..1c44f76b17 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -28,7 +28,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* SD/MMC */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 @@ -52,7 +51,7 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Linux boot */ -#define CONFIG_HOSTNAME usbarmory +#define CONFIG_HOSTNAME "usbarmory" #define CONFIG_BOOTCOMMAND \ "run distro_bootcmd; " \ "setenv bootargs console=${console} ${bootargs_default}; " \ diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 5159568da1..bbd8ec5e3c 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -265,7 +265,6 @@ /* * TSEC */ -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ #define CONFIG_TSEC1 #ifdef CONFIG_TSEC1 @@ -438,7 +437,7 @@ #define CONFIG_NETDEV eth0 -#define CONFIG_HOSTNAME ve8313 +#define CONFIG_HOSTNAME "ve8313" #define CONFIG_UBOOTPATH ve8313/u-boot.bin #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 80a501e560..267b274541 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -42,7 +42,6 @@ #define CONFIG_MTD_DEVICE #endif -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/vinco.h b/include/configs/vinco.h index ca3958986b..9a63b3f76e 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -38,7 +38,6 @@ /* SerialFlash */ #ifdef CONFIG_CMD_SF -#define CONFIG_ATMEL_SPI #define CONFIG_ATMEL_SPI0 #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index f054c9933f..45d1c35faa 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -92,7 +92,6 @@ #define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_OFFSET_REDUND (9 * SZ_64K) diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index ec15a44a9e..9559b503db 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -278,10 +278,6 @@ /* * TSEC configuration */ -#ifdef VME_CADDY2 -#else -#define CONFIG_TSEC_ENET /* TSEC ethernet support */ -#endif #if defined(CONFIG_TSEC_ENET) @@ -499,7 +495,7 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_HOSTNAME VME8349 +#define CONFIG_HOSTNAME "VME8349" #define CONFIG_ROOTPATH "/tftpboot/rootfs" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 487cb1f5df..7b502840cb 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -12,7 +12,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 @@ -79,7 +78,6 @@ #define CONFIG_IMX_VIDEO_SKIP #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "splashpos=m,m\0" \ diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index c61865f0b2..028e3ff937 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -23,7 +23,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_IMAGE_FORMAT_LEGACY /* general purpose I/O */ @@ -53,7 +52,6 @@ #define CONFIG_SYS_MEMTEST_START 0x21000000 #define CONFIG_SYS_MEMTEST_END 0x22000000 -#define CONFIG_SYS_ALT_MEMTEST /* NAND flash */ #define CONFIG_NAND_ATMEL diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index fa8e9a2a51..7e993b8298 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -53,7 +53,6 @@ #define CONFIG_RTC_MC13XXX /* mmc driver */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 @@ -165,7 +164,7 @@ * to update uboot and load kernel */ -#define CONFIG_HOSTNAME woodburn +#define CONFIG_HOSTNAME "woodburn" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -183,9 +182,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -199,7 +198,7 @@ "run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "else echo Images not loades;fi\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 1374370187..ee82816cd9 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -25,7 +25,6 @@ #if !defined(CONFIG_SPL_BUILD) #define CONFIG_SKIP_LOWLEVEL_INIT #endif -#define CONFIG_BOARD_EARLY_INIT_R /* generate LPC32XX-specific SPL image */ #define CONFIG_LPC32XX_SPL diff --git a/include/configs/x600.h b/include/configs/x600.h index 5b2d0bf536..a6fb9889be 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -113,13 +113,13 @@ #define CONFIG_SYS_MALLOC_LEN (8 << 20) #define CONFIG_SYS_LOAD_ADDR 0x00800000 -#define CONFIG_HOSTNAME x600 +#define CONFIG_HOSTNAME "x600" #define CONFIG_UBI_PART ubi0 #define CONFIG_UBIFS_VOLUME rootfs #define CONFIG_EXTRA_ENV_SETTINGS \ "u-boot_addr=1000000\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.spr\0" \ "load=tftp ${u-boot_addr} ${u-boot}\0" \ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize};" \ @@ -129,7 +129,7 @@ "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize}\0" \ "upd=run load update\0" \ - "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \ + "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0" \ "part=" __stringify(CONFIG_UBI_PART) "\0" \ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \ "load_ubifs=tftp ${kernel_addr} ${ubifs}\0" \ @@ -154,12 +154,12 @@ "saveenv;boot\0" \ "ubifsargs=set bootargs ubi.mtd=ubi${boot_part} " \ "root=ubi0:rootfs rootfstype=ubifs\0" \ - "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "kernel=" CONFIG_HOSTNAME "/uImage\0" \ "kernel_fs=/boot/uImage \0" \ "kernel_addr=1000000\0" \ - "dtb=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "dtb=" CONFIG_HOSTNAME "/" \ + CONFIG_HOSTNAME ".dtb\0" \ + "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0" \ "dtb_addr=1800000\0" \ "load_kernel=tftp ${kernel_addr} ${kernel}\0" \ "load_dtb=tftp ${dtb_addr} ${dtb}\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 8d8c689049..6d650b79da 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -17,8 +17,6 @@ */ #define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_PHYSMEM -#define CONFIG_DISPLAY_BOARDINFO_LATE -#define CONFIG_LAST_STAGE_INIT #define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_LMB @@ -112,7 +110,7 @@ /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" -#define CONFIG_HOSTNAME x86 +#define CONFIG_HOSTNAME "x86" #define CONFIG_BOOTFILE "bzImage" #define CONFIG_LOADADDR 0x1000000 #define CONFIG_RAMDISK_ADDR 0x4000000 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 8c0b5d9c06..8cdc72206c 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -20,7 +20,6 @@ #define GICD_BASE 0xF9010000 #define GICC_BASE 0xF9020000 -#define CONFIG_SYS_ALT_MEMTEST #ifndef CONFIG_SYS_MEMTEST_SCRATCH # define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 #endif @@ -144,7 +143,6 @@ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_CLOCKS #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 5c8342eee7..e05ec5421a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_BOARD_NAME "XPedite5170" #define CONFIG_SYS_FORM_3U_VPX 1 #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ -#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1 /* High BATs supported and enabled */ #define CONFIG_ALTIVEC 1 @@ -79,7 +78,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Diagnostics */ -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY |\ @@ -299,7 +297,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Networking options */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_ETHPRIME "eTSEC1" diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index b159d91b07..63479533dc 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -16,7 +16,6 @@ */ #define CONFIG_SYS_BOARD_NAME "XPedite5200" #define CONFIG_SYS_FORM_PMC_XMC 1 -#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ #define CONFIG_PCI1 1 /* PCI controller 1 */ @@ -55,7 +54,6 @@ /* * Diagnostics */ -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ @@ -238,7 +236,6 @@ /* * Networking options */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_ETHPRIME "eTSEC1" diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 9f4a9203c0..d0d21c43f0 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -16,7 +16,6 @@ */ #define CONFIG_SYS_BOARD_NAME "XPedite5370" #define CONFIG_SYS_FORM_3U_VPX 1 -#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ #define CONFIG_PCIE1 1 /* PCIE controller 1 */ @@ -72,7 +71,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Diagnostics */ -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ @@ -298,7 +296,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Networking options */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_TSEC_TBI #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 3627aed816..f7ac2f49f0 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_BOARD_NAME "XPedite5500" #define CONFIG_SYS_FORM_PMC_XMC 1 #define CONFIG_PRPMC_PCI_ALIAS "pci0" /* Processor PMC interface on pci0 */ -#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ #define CONFIG_PCIE1 1 /* PCIE controller 1 (PEX8112 or XMC) */ @@ -70,7 +69,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Diagnostics */ -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ @@ -282,7 +280,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Networking options */ -#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_TSEC_TBI #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ |