diff options
Diffstat (limited to 'include')
317 files changed, 386 insertions, 466 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 519bb0b..de91e57 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -42,7 +42,7 @@ * Note: With driver model, the label is allocated so there is no need for * the caller to preserve it. * - * @param gp GPIO number + * @param gpio GPIO number * @param label User label for this GPIO * @return 0 if ok, -1 on error */ @@ -127,7 +127,7 @@ struct gpio_desc { }; /** - * dm_gpio_is_valid() - Check if a GPIO is gpio_is_valie + * dm_gpio_is_valid() - Check if a GPIO is valid * * @desc: GPIO description containing device, offset and flags, * previously returned by gpio_request_by_name() @@ -167,7 +167,7 @@ int gpio_get_status(struct udevice *dev, int offset, char *buf, int buffsize); * * @dev: Device to check * @offset: Offset of device GPIO to check - * @namep: If non-NULL, this is set to the nane given when the GPIO + * @namep: If non-NULL, this is set to the name given when the GPIO * was requested, or -1 if it has not been requested * @return -ENODATA if the driver returned an unknown function, * -ENODEV if the device is not active, -EINVAL if the offset is invalid. @@ -186,7 +186,7 @@ int gpio_get_function(struct udevice *dev, int offset, const char **namep); * * @dev: Device to check * @offset: Offset of device GPIO to check - * @namep: If non-NULL, this is set to the nane given when the GPIO + * @namep: If non-NULL, this is set to the name given when the GPIO * was requested, or -1 if it has not been requested * @return -ENODATA if the driver returned an unknown function, * -ENODEV if the device is not active, -EINVAL if the offset is invalid. @@ -219,7 +219,7 @@ struct fdtdec_phandle_args; * Also it would be useful to standardise additional functions like * pullup, slew rate and drive strength. * - * gpio_request)( and gpio_free() are optional - if NULL then they will + * gpio_request() and gpio_free() are optional - if NULL then they will * not be called. * * Note that @offset is the offset from the base GPIO of the device. So @@ -271,7 +271,7 @@ struct dm_gpio_ops { * * @dev: GPIO device * @desc: Place to put GPIO description - * @args: Arguments provided in descripion + * @args: Arguments provided in description * @return 0 if OK, -ve on error */ int (*xlate)(struct udevice *dev, struct gpio_desc *desc, @@ -398,7 +398,7 @@ int gpio_request_by_name(struct udevice *dev, const char *list_name, /** * gpio_request_list_by_name() - Request a list of GPIOs * - * Reads all the GPIOs from a list and requetss them. See + * Reads all the GPIOs from a list and requests them. See * gpio_request_by_name() for additional details. Lists should not be * misused to hold unrelated or optional GPIOs. They should only be used * for things like parallel data lines. A zero phandle terminates the list @@ -533,7 +533,7 @@ int dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong flags); /** * gpio_get_number() - Get the global GPIO number of a GPIO * - * This should only be used for debugging or interest. It returns the nummber + * This should only be used for debugging or interest. It returns the number * that should be used for gpio_get_value() etc. to access this GPIO. * * @desc: GPIO description containing device, offset and flags, diff --git a/include/bootm.h b/include/bootm.h index 6181488..4981377 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -49,7 +49,7 @@ int boot_selected_os(int argc, char * const argv[], int state, ulong bootm_disable_interrupts(void); /* This is a special function used by booti/bootz */ -int bootm_find_ramdisk_fdt(int flag, int argc, char * const argv[]); +int bootm_find_images(int flag, int argc, char * const argv[]); int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], int states, bootm_headers_t *images, int boot_progress); diff --git a/include/bootstage.h b/include/bootstage.h index fe30ab6..9765360 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -168,6 +168,7 @@ enum bootstage_id { BOOTSTAGE_ID_NAND_FIT_READ = 150, BOOTSTAGE_ID_NAND_FIT_READ_OK, + BOOTSTAGE_ID_FIT_LOADABLE_START = 160, /* for Loadable Images */ /* * These boot stages are new, higher level, and not directly related * to the old boot progress numbers. They are useful for recording diff --git a/include/common.h b/include/common.h index d4d704a..ea5aeb0 100644 --- a/include/common.h +++ b/include/common.h @@ -274,7 +274,7 @@ __weak int arch_reserve_stacks(void); * * @param size Size of DRAM (which should be displayed along with other info) */ -void board_show_dram(ulong size); +void board_show_dram(phys_size_t size); /** * arch_fixup_fdt() - Write arch-specific information to fdt diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 2c2a05b..4d9f63d 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -66,7 +66,6 @@ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_MTDPARTS /* mtd parts support */ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_ONENAND /* OneNAND support */ #define CONFIG_CMD_PCI /* pciinfo */ @@ -83,7 +82,6 @@ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SCSI /* SCSI Support */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ -#define CONFIG_CMD_SETEXPR /* setexpr support */ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ #define CONFIG_CMD_SNTP /* SNTP support */ #define CONFIG_CMD_SOURCE /* "source" command support */ diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h index e79a13b..b915c2f 100644 --- a/include/config_cmd_default.h +++ b/include/config_cmd_default.h @@ -33,7 +33,6 @@ #define CONFIG_CMD_LOADS /* loads */ #define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc*/ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SAVEENV /* saveenv */ diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 5eea5cf..bd8fbca 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -49,7 +49,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_PXE diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index dca1ca5..6b5aa1b 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -719,7 +719,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 @@ -770,11 +769,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 047ed8b..ec49796 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -353,7 +353,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_DOS_PARTITION #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR /* * Miscellaneous configurable options diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index ceee0e4..65a7067 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -92,7 +92,6 @@ #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_E1000 /* E1000 pci Ethernet card*/ @@ -592,7 +591,6 @@ combinations. this should be removed later #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 7c45c36..e737960 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -99,7 +99,6 @@ #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_E1000 @@ -441,7 +440,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #ifdef CONFIG_TSEC_ENET -#define CONFIG_NET_MULTI #define CONFIG_MII /* MII PHY management */ #define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ #define CONFIG_TSEC1 1 @@ -505,7 +503,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 845ed81..3ccb9a7 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -62,7 +62,6 @@ #define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index d0f4d75..03fa5e6 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -31,7 +31,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index ce33ba4..04e52f2 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -49,7 +49,6 @@ #define CONFIG_CMD_LOADS #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_USB diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index a766324..8bf4e53 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -46,7 +46,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 6167ea1..b4fa5af 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -41,7 +41,6 @@ */ #include <config_cmd_default.h> #define CONFIG_CMD_CACHE -#undef CONFIG_CMD_NET #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 64dc64d..0bfa946 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -51,7 +51,6 @@ */ #include <config_cmd_default.h> #define CONFIG_CMD_CACHE -#undef CONFIG_CMD_NET #define CONFIG_CMD_LOADB #define CONFIG_CMD_LOADS #define CONFIG_CMD_EXT2 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 9946108..f5cd0a0 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -60,7 +60,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_MISC #define CONFIG_CMD_ELF diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 14ccddb..3660dda 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -60,7 +60,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_ELF #define CONFIG_CMD_FLASH #define CONFIG_CMD_I2C diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 4d3390b..aeba9c0 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -49,7 +49,6 @@ */ #include <config_cmd_default.h> #define CONFIG_CMD_CACHE -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_MII diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index e2dd8e5..65adadc 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -37,7 +37,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 5a7597c..16ef80b 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -37,7 +37,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 7550c57..e3c36a6 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -37,7 +37,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 25b3cda..e40bbfd 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -53,7 +53,6 @@ #define CONFIG_CMD_MISC #define CONFIG_CMD_MII #undef CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO @@ -79,7 +78,6 @@ /* Network configuration */ #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC -#define CONFIG_NET_MULTI 1 #define CONFIG_MII 1 #define CONFIG_MII_INIT 1 #define CONFIG_SYS_DISCOVER_PHY diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index f3cade3..d26ad91 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -52,7 +52,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index b708001..b735a26 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -55,7 +55,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #undef CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 658c170..427ccf0 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -39,7 +39,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index efb64a1..26a16ec 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -39,7 +39,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 1ab2379..9b196ad 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -453,7 +453,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 2457125..7204068 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -501,7 +501,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_IRQ -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_SDRAM diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index d41eeb5..f57afff 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -644,12 +644,10 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index b388168..ff9a67d 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -354,7 +354,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 609c5bb..6b7f784 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -373,7 +373,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 479589e..ad2c52c 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -389,12 +389,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI - #define CONFIG_CMD_NET #define CONFIG_CMD_SCSI #define CONFIG_CMD_EXT2 #endif diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index fb28512..f49b1e5 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -498,7 +498,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 48b55b5..15b6e6c 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -371,7 +371,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 92f0b7f..2250c2f 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -390,7 +390,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 57fc37b..91bf267 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -393,7 +393,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index e624c71..4cb586d 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -484,7 +484,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_MII #define CONFIG_CMD_ELF #define CONFIG_CMD_IRQ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 7b3ddba..943c575 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -601,12 +601,10 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_ELF -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_CMD_SCSI #define CONFIG_CMD_EXT2 #endif diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index cae133b..4b99fc3 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -294,7 +294,6 @@ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_CMD_NET #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_CMD_REGINFO diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 88df94f..d10bd2a 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -17,7 +17,6 @@ #define CONFIG_CMD_LOADS #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ccf3ce3..37bb42b 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -184,7 +184,6 @@ #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_E1000 /* E1000 pci Ethernet card*/ @@ -822,7 +821,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 795e3b5..0f5915d 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -688,12 +688,10 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index d65c461..233995c 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -276,12 +276,10 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index f99da65..c78a421 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -629,11 +629,9 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index c29429d..b8d4dc5 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -283,7 +283,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 2927043..0f8b614 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -862,11 +862,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index deff617..5ada99f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -868,12 +868,10 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_PING #define CONFIG_CMD_ECHO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_BDI #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index faf8c9d..6cc4cdb 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -736,11 +736,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 6cc95ef..262aeaf 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -760,11 +760,9 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index bad3613..e80b0b5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -620,7 +620,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ -#define CONFIG_NET_MULTI #define CONFIG_E1000 #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ @@ -804,13 +803,11 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #define CONFIG_CMD_BDI #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 107efdc..c5db4f3 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -568,7 +568,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata LSZ ADD */ -#define CONFIG_NET_MULTI #define CONFIG_E1000 #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ @@ -759,13 +758,11 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_I2C #define CONFIG_CMD_PING #define CONFIG_CMD_ECHO -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #define CONFIG_CMD_BDI #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 2a22249..e38a6f7 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -277,7 +277,6 @@ #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 @@ -329,11 +328,9 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 57e0c6c..ec52d6a 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -424,7 +424,6 @@ #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 /* Defind e1000 pci Ethernet card*/ #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_DOS_PARTITION @@ -505,7 +504,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ERRATA #define CONFIG_CMD_CRAMFS diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index d23d2c4..f8cea62 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -60,7 +60,6 @@ #define CONFIG_BOOTP_SERVERIP #define CONFIG_NET_RETRY_COUNT 3 #define CONFIG_CMD_LINK_LOCAL -#define CONFIG_LIB_RAND #define CONFIG_NETCONSOLE #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_CMD_PING diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 54b7028..28f4de2 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -372,7 +372,6 @@ * Ethernet configuration */ #define CONFIG_MPC512x_FEC 1 -#define CONFIG_NET_MULTI #define CONFIG_PHY_ADDR 0x1F #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_FEC_AN_TIMEOUT 1 diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h index 39f7a3c..c46eed9 100644 --- a/include/configs/adp-ag102.h +++ b/include/configs/adp-ag102.h @@ -81,7 +81,6 @@ /* * Ethernet */ -#define CONFIG_NET_MULTI #define CONFIG_PHY_MAX_ADDR 32 /* this comes from <linux/phy.h> */ #define CONFIG_SYS_DISCOVER_PHY #define CONFIG_FTGMAC100 diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 2782e55..0f125dc 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -228,7 +228,6 @@ #undef CONFIG_CMD_LOADS #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_CMD_PCI diff --git a/include/configs/alt.h b/include/configs/alt.h index e9ffa48..646cb61 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_NO_FLASH /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index c3c9169..9b31b9c 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -150,7 +150,6 @@ #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_OMAP34XX -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* * Board NAND Info. diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 331fdac..d4f4c23 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -306,7 +306,6 @@ #endif /* CPSW Ethernet */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_MII @@ -319,7 +318,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_NET_MULTI #define CONFIG_PHY_GIGE #define CONFIG_PHYLIB diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 9e7f37d..9d6146a 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -67,11 +67,9 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SETEXPR /* * Miscellaneous configurable options diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 5a06311..5e197be 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -24,7 +24,6 @@ #include <config_cmd_default.h> #undef CONFIG_CMD_AES #undef CONFIG_CMD_BOOTD -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_XIMG diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 462b2e2..573c98f 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -18,7 +18,6 @@ #define CONFIG_CMD_LOADS #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 4282d70..5b95dd3 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -20,7 +20,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_MII #define CONFIG_CMD_NFS diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 6d38853..aba9ba6 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -57,11 +57,9 @@ #define CONFIG_E1000_NO_NVM /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* Miscellaneous commands */ -#define CONFIG_CMD_SETEXPR #define CONFIG_FAT_WRITE /* Increase console I/O buffer size */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 403692d..7554023 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -86,7 +86,6 @@ #define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PING /* ping support */ -#define CONFIG_CMD_SETEXPR /* setexpr support */ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index d1f18bc..445cb19 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -34,7 +34,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV @@ -88,7 +87,6 @@ /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC -#define CONFIG_NET_MULTI #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 #define IMX_FEC_BASE MXS_ENET0_BASE diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 1abaabf..eb50639 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -35,7 +35,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -57,7 +56,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_EXTRA_ENV_SETTINGS \ "script=u-boot.scr\0" \ diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 72469f3..e540e3f 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -21,7 +21,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_RUN #define CONFIG_CMD_LOADS -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -121,7 +120,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x0 diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 47760ef..f4cf1c0 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #include <config_cmd_default.h> #define CONFIG_CMD_I2C -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 7b9ff8f..bd0919e 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -69,7 +69,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC #define CONFIG_CMD_XIMG -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #if ENABLE_JFFS #define CONFIG_CMD_JFFS2 diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 94981e7..9289964 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -54,7 +54,6 @@ #undef CONFIG_CMD_LOADS #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_SYS_USE_MMC #define CONFIG_BOOTARGS \ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index e43795b..637d150 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -82,7 +82,6 @@ #undef CONFIG_CMD_IMI #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_USB diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index eaed7ea..8374733 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -100,7 +100,6 @@ * "ethaddr" and "eth1addr". This is normally done during production. */ #define CONFIG_OVERWRITE_ETHADDR_ONCE -#define CONFIG_NET_MULTI /* * BOOTP/DHCP options diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 63704b1..b2ad30e 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -103,7 +103,6 @@ #define CONFIG_CMD_MMC #undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 331a60d..19f049a 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -103,7 +103,6 @@ #define CONFIG_CMD_MMC #undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 389f75b..5e8c14d 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -117,7 +117,6 @@ * Ethernet configuration */ #define CONFIG_DW_AUTONEG -#define CONFIG_NET_MULTI /* * Command line configuration diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h index 848a158..60981f9 100644 --- a/include/configs/balloon3.h +++ b/include/configs/balloon3.h @@ -48,7 +48,6 @@ */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 1045779..900dc42 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -134,7 +134,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_FAT_WRITE -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #endif /* __BCM28155_AP_H */ diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h index 0d9fe57..36637ae 100644 --- a/include/configs/bct-brettl2.h +++ b/include/configs/bct-brettl2.h @@ -73,7 +73,6 @@ #define CONFIG_GATEWAYIP 192.168.233.1 #define CONFIG_SERVERIP 192.168.233.53 #define CONFIG_ROOTPATH "/romfs/brettl2" -#define CONFIG_LIB_RAND #endif diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h index 4aa8550..369f7b8 100644 --- a/include/configs/beagle_x15.h +++ b/include/configs/beagle_x15.h @@ -45,7 +45,6 @@ /* CPSW Ethernet */ #define CONFIG_CMD_NFS -#define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ #define CONFIG_CMD_DHCP #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 58013c6..84541b9 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -85,7 +85,6 @@ #define CONFIG_RTL8169 /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-usb-gadget.h" diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index dcd19e4..0df463f 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -87,7 +87,6 @@ #endif #define CONFIG_HOSTNAME bf518f-ezbrd #define CONFIG_PHY_ADDR 3 -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index 008f4b5..0ac3a09 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -96,7 +96,6 @@ /* this sets up the default list of enabled commands */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS #undef CONFIG_CMD_IMLS diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index ad5fa53..83f57cd 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -85,7 +85,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME bf526-ezbrd -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index b23a250..32ac961 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -83,7 +83,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME bf527-ezkit -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index e705d08..53b7ab5 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH "/romfs" -#define CONFIG_LIB_RAND /* * Flash Settings @@ -153,7 +152,6 @@ # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING #else -# undef CONFIG_CMD_NET # undef CONFIG_CMD_NFS #endif diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index be11a85..850c516 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -65,7 +65,6 @@ #define CONFIG_RMII #endif #define CONFIG_HOSTNAME bf537-pnav -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 9a7edf3..2da5d29 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -86,7 +86,6 @@ #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH "/romfs" -#define CONFIG_LIB_RAND /* * Flash Settings @@ -152,7 +151,6 @@ # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING #else -# undef CONFIG_CMD_NET # undef CONFIG_CMD_NFS #endif diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 41f1b1f..84ef4ed 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -65,7 +65,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME bf537-stamp -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index 03f3cec..299c4c2 100644 --- a/include/configs/bf561-acvilon.h +++ b/include/configs/bf561-acvilon.h @@ -76,7 +76,6 @@ * Network Settings */ #define ADI_CMDS_NETWORK 1 -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_DATE #define CONFIG_CMD_DTT diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 7507d57..73f3bfe 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -69,12 +69,10 @@ */ #define ADI_CMDS_NETWORK #define CONFIG_NETCONSOLE -#define CONFIG_NET_MULTI #define CONFIG_HOSTNAME "bf609-ezkit" #define CONFIG_PHY_ADDR 1 #define CONFIG_DW_PORTS 1 #define CONFIG_DW_ALTDESCRIPTOR -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_MII #define CONFIG_PHYLIB diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 143d3dd..1c9d584 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -17,7 +17,6 @@ # define CONFIG_BOOTP_DNS # define CONFIG_BOOTP_NTPSERVER # define CONFIG_BOOTP_RANDOM_DELAY -# define CONFIG_LIB_RAND # define CONFIG_KEEP_SERVERADDR # define CONFIG_CMD_DNS # define CONFIG_CMD_PING @@ -26,7 +25,6 @@ # endif # else # undef CONFIG_CMD_BOOTD -# undef CONFIG_CMD_NET # undef CONFIG_CMD_NFS # endif # ifdef CONFIG_LIBATA diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 507d972..7f364cd 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -22,11 +22,9 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_SF #define CONFIG_CMD_SPI @@ -44,7 +42,6 @@ /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC -#define CONFIG_NET_MULTI #endif /* SPI */ diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index 28bc653..ee526af 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -108,7 +108,6 @@ # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING #else -# undef CONFIG_CMD_NET #endif #ifdef CONFIG_SYS_I2C_SOFT diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index b441fa0..e28e5ad 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -3,7 +3,7 @@ * * common parts used by B&R AM335x based boards * - * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> - + * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> - * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com * * SPDX-License-Identifier: GPL-2.0+ @@ -17,17 +17,13 @@ "defaultip=192.168.60.253\0" \ "defaultsip=192.168.60.254\0" \ "netconsole=echo switching to network console ...; " \ -"if dhcp; then " \ -"setenv ncip ${serverip}; else " \ -"setenv ncip 192.168.60.254; " \ -"setenv serverip 192.168.60.254; " \ -"setenv gatewayip 192.168.60.254; " \ -"setenv ipaddr 192.168.60.1; " \ -"fi;" \ -"setenv netdisplay0 '" \ -"setcurs 1 9; puts myip; setcurs 10 9; puts ${ipaddr};" \ -"setcurs 1 10;puts serverip; setcurs 10 10; puts ${serverip};" \ -"run netdisplay0; " \ +"if dhcp; then setenv ncip ${serverip}; " \ +"else " \ +"setenv ncip 192.168.60.254; setenv serverip 192.168.60.254; " \ +"setenv gatewayip 192.168.60.254; setenv ipaddr 192.168.60.1; " \ +"fi; " \ +"setcurs 1 9; lcdputs myip; setcurs 10 9; lcdputs ${ipaddr};" \ +"setcurs 1 10;lcdputs serverip; setcurs 10 10; lcdputs ${serverip};" \ "setenv stdout nc;setenv stdin nc;setenv stderr nc\0" #define CONFIG_CMD_TIME @@ -61,7 +57,6 @@ #define CONFIG_BAUDRATE 115200 /* Network defines */ -#define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ #define CONFIG_CMD_DHCP #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_SEND_HOSTNAME diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 44c947f..5169b41 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -325,7 +325,6 @@ #define CONFIG_CMD_GPIO #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 55de464..c76a426 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -87,7 +87,6 @@ #define CONFIG_RTL8169 /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-post.h" diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 387f1cb..e9e4e14 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -83,7 +83,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME cm-bf527 -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 95afd51..0eebe56 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -71,7 +71,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME cm-bf537e -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 4df4a05..3a2d726 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -69,7 +69,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME cm-bf537u -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 0cd4aec..a129f68 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -90,7 +90,6 @@ /* Enabled commands */ #define CONFIG_CMD_DHCP /* DHCP Support */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_PING /* USB Networking options */ diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index 32cecbd..9bc3795 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -46,7 +46,6 @@ */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET /* disabeled - causes compile errors */ #undef CONFIG_CMD_NFS #define CONFIG_CMD_MEMORY diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 7fc364e..6f25fdb 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -56,7 +56,6 @@ #undef CONFIG_CMD_LOADB /* Both together */ #undef CONFIG_CMD_LOADS /* saves 10 KB */ -#define CONFIG_CMD_NET #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index c17f245..a3f27e3 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -41,7 +41,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* NAND support */ @@ -60,7 +59,6 @@ #define CONFIG_CMD_CACHE /* Miscellaneous commands */ -#define CONFIG_CMD_SETEXPR #define CONFIG_FAT_WRITE /* Increase console I/O buffer size */ diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index ee6fa1c..4655668 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -50,11 +50,9 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* Miscellaneous commands */ -#define CONFIG_CMD_SETEXPR #define CONFIG_FAT_WRITE /* Increase console I/O buffer size */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 56e6d97..f26aad4 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -97,7 +97,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET1_BASE_ADDR diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index bfcfa0c..9cab9fb 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -405,9 +405,7 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 8e27ae4..bf765af 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -630,12 +630,10 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 4fef433..0e1f046 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -17,8 +17,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_ARCH_MISC_INIT -#define CONFIG_NR_DRAM_BANKS 1 - #define CONFIG_X86_SERIAL #define CONFIG_SMSC_LPC47M diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index 0bdcef7..ab5226b 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -188,7 +188,6 @@ #endif #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index e5a612c..37a485b 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -309,7 +309,6 @@ #endif #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 5f5eb3b..e702a50 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -72,7 +72,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-post.h" diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h index 2c5a837..b02e73c 100644 --- a/include/configs/davinci_dm6467evm.h +++ b/include/configs/davinci_dm6467evm.h @@ -71,7 +71,6 @@ extern unsigned int davinci_arm_clk_get(void); #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_CMD_NET /* Flash & Environment */ #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 70aa699..ea55084 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -90,7 +90,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_LOADB -#define CONFIG_CMD_NET #undef CONFIG_CMD_I2C #undef CONFIG_CMD_IDE diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 9326401..5ec3c99 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -122,7 +122,6 @@ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS /* NFS support */ #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h index 3f1f9f3..3cbd67f 100644 --- a/include/configs/dnp5370.h +++ b/include/configs/dnp5370.h @@ -56,7 +56,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_LIB_RAND #endif /* @@ -123,7 +122,6 @@ #include <config_cmd_default.h> #ifndef CONFIG_BFIN_MAC -# undef CONFIG_CMD_NET # undef CONFIG_CMD_NFS #endif diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index d79612b..77edc21 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -100,7 +100,6 @@ #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ -#define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ #define CONFIG_CMD_DHCP #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/duovero.h b/include/configs/duovero.h index e68f415..6e53da5 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -45,7 +45,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_NET #define CONFIG_SMC911X #define CONFIG_SMC911X_32_BIT diff --git a/include/configs/ea20.h b/include/configs/ea20.h index fc02b30..1e522c3 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -165,7 +165,6 @@ #endif #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index e2b9326..5f6148e 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -72,7 +72,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_LED #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_MCFTMR diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index e26591c..358314c 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -32,7 +32,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_MII #define CONFIG_CMD_NFS diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index a82e8bc..70f1226 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -142,7 +142,6 @@ #define CONFIG_MII_SUPPRESS_PREAMBLE #define CONFIG_MII #define CONFIG_PHY_ADDR 1 -#define CONFIG_NET_MULTI #undef CONFIG_NETCONSOLE /* SDRAM configuration */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 56950e0..5dfd56c 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -81,7 +81,6 @@ #undef CONFIG_CMD_FPGA #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h index cdea4a8..3be17f1 100644 --- a/include/configs/enbw_cmc.h +++ b/include/configs/enbw_cmc.h @@ -262,7 +262,6 @@ #endif #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/espt.h b/include/configs/espt.h index de16be7..f717954 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -20,7 +20,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_ENV diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index b79000e..2b638bf 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -129,7 +129,6 @@ #define CONFIG_CMD_RARP #define CONFIG_CMD_REISER #define CONFIG_CMD_SAVES -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_SF #define CONFIG_CMD_SNTP #define CONFIG_CMD_UBI diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index dbe05e4..f6b0a6f 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -24,14 +24,12 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_XIMG #undef CONFIG_CMD_ONENAND #undef CONFIG_CMD_MTDPARTS #define CONFIG_CMD_DFU #define CONFIG_CMD_GPT -#define CONFIG_CMD_SETEXPR /* USB Composite download gadget - g_dnl */ #define CONFIG_USBDOWNLOAD_GADGET diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 5f7cad8..846b868 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -87,7 +87,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_SPI #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h index d0083fd6f..f1cbc8e 100644 --- a/include/configs/fx12mm.h +++ b/include/configs/fx12mm.h @@ -24,7 +24,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_FLASH_CFI_MTD -#undef CONFIG_CMD_NET /* sdram */ #define CONFIG_SYS_SDRAM_SIZE_MB 64 diff --git a/include/configs/galileo.h b/include/configs/galileo.h index f780b8f..fd89bf3 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -15,8 +15,7 @@ #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_BOARD_EARLY_INIT_F - -#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_ARCH_MISC_INIT #define CONFIG_X86_SERIAL diff --git a/include/configs/gose.h b/include/configs/gose.h index 0dc28c7..04f0383 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -49,7 +49,6 @@ #define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 7c320ee..dd8653a 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -259,6 +259,7 @@ /* USE GRETH Ethernet Driver */ #define CONFIG_GRETH 1 +#endif #define CONFIG_PHY_ADDR 0x00 diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 21b4f5e..6c52a17 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -59,7 +59,6 @@ #define CONFIG_CMD_LOADB /* loadb */ #define CONFIG_CMD_LOADS /* loads */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 406bf2e..6b8c82d 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -162,10 +162,8 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_GSC #define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_CMD_UBI diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 109cee9..c00b951 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -145,7 +145,6 @@ #define CONFIG_USB_DEV_PULLUP_GPIO 33 /* USB VBUS GPIO 3 */ -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_BOOTDELAY 2 diff --git a/include/configs/harmony.h b/include/configs/harmony.h index ad3dcdb..99a63d6 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -58,7 +58,6 @@ #define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* LCD support */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index e7df9ad..2916987 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -475,7 +475,6 @@ int fpga_gpio_get(unsigned int bus, int pin); #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index c1ca56c..8b4278d 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -171,7 +171,6 @@ #define CONFIG_TSEC1 #define CONFIG_TSEC2 #define CONFIG_TSEC_ENET -#define CONFIG_NET_MULTI #define CONFIG_HARD_SPI #define CONFIG_HARD_I2C diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h index ad1614a..71ca77a 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -46,7 +46,6 @@ #define CONFIG_DOS_PARTITION /* Ethernet on FEC */ -#define CONFIG_NET_MULTI #define CONFIG_MII #define CONFIG_FEC_MXC diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 8439db7..12eb172 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -68,7 +68,6 @@ #define CONFIG_CMD_PCI #define CONFIG_PCI_PNP -#define CONFIG_NET_MULTI #define CONFIG_TULIP #define CONFIG_EEPRO100 #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ diff --git a/include/configs/ip04.h b/include/configs/ip04.h index 2bd81fc..73bbcb6 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -77,7 +77,6 @@ #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE + 2) -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 664a2b2..16bc373 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -270,7 +270,6 @@ #endif #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index aeafbd5..606e6b4 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -73,7 +73,6 @@ #define CONFIG_RTL8169 /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-usb-gadget.h" diff --git a/include/configs/jornada.h b/include/configs/jornada.h index 7e18d8e..dd30ba2 100644 --- a/include/configs/jornada.h +++ b/include/configs/jornada.h @@ -46,7 +46,6 @@ #include <config_cmd_default.h> #define CONFIG_CMD_FLASH #define CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_MISC diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 517f46a..5649901 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -27,7 +27,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_SETEXPR #undef CONFIG_WATCHDOG /* disable platform specific watchdog */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index b70b5b1..686d2f3 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -406,7 +406,6 @@ int get_scl(void); * additionnal command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_CMD_ERRATA /* we don't need flash support */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 1dffab1..61c015f 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -49,7 +49,6 @@ #define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 42280ca..036f2cb 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -98,7 +98,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 32 -#define CONFIG_NET_MULTI #define CONFIG_SYS_SGMII_REFCLK_MHZ 312 #define CONFIG_SYS_SGMII_LINERATE_MHZ 1250 #define CONFIG_SYS_SGMII_RATESCALE 2 diff --git a/include/configs/kwb.h b/include/configs/kwb.h index d1c745e..acff5b9 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -3,7 +3,7 @@ * * specific parts for B&R KWB Motherboard * - * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> - + * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> - * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com * * SPDX-License-Identifier: GPL-2.0+ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index ac74ae7..7111b08 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -127,7 +127,6 @@ #define TMU_CLK_DIVIDER (4) /* 4 (default), 16, 64, 256 or 1024 */ /* Ether */ -#define CONFIG_NET_MULTI #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_SMC911X diff --git a/include/configs/lager.h b/include/configs/lager.h index e830c6d..f121b9c 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_NO_FLASH /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h index a269372..e3dd5e0 100644 --- a/include/configs/lp8x4x.h +++ b/include/configs/lp8x4x.h @@ -46,7 +46,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_NET #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 1a41a2f..ca913b0 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -526,18 +526,15 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_PCIE_MEM_SIZE 0x08000000 /* 128M */ #ifdef CONFIG_PCI -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP #define CONFIG_E1000 #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8ea428e..6b6f2ba 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -343,18 +343,15 @@ #define CONFIG_SYS_PCIE_MEM_SIZE 0x08000000 /* 128M */ #ifdef CONFIG_PCI -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP #define CONFIG_E1000 #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index e270fc8..547026e 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -213,7 +213,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_CMD_LOADB #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_RUN diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h index 711d529..cd2b080 100644 --- a/include/configs/ls2085aqds.h +++ b/include/configs/ls2085aqds.h @@ -304,12 +304,10 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ #ifdef CONFIG_PCI -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP #define CONFIG_E1000 #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* MMC */ diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h index d1c2548..0837fcd 100644 --- a/include/configs/ls2085ardb.h +++ b/include/configs/ls2085ardb.h @@ -269,12 +269,10 @@ unsigned long get_board_sys_clk(void); #define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ #ifdef CONFIG_PCI -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP #define CONFIG_E1000 #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* MMC */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 490f84e..7d22173 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -37,7 +37,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_SHOW_BOOT_PROGRESS -#define CONFIG_LIB_RAND #define CONFIG_KIRKWOOD_GPIO #define CONFIG_OF_LIBFDT diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index d43db52..799850a 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -440,7 +440,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index dbc00ce..eba1b2f 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -40,10 +40,8 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_CMD_USB diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 0cc1282..2d2b226 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -44,10 +44,8 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SATA -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_USB #define CONFIG_VIDEO diff --git a/include/configs/mcx.h b/include/configs/mcx.h index de7792a..3405c83 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -152,7 +152,6 @@ #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_NFS /* diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index f721a4d..b5d72e3 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -46,7 +46,6 @@ #define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* LCD support */ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index b84eead..db463c0 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -260,7 +260,6 @@ #endif #ifndef CONFIG_SYS_ENET -# undef CONFIG_CMD_NET # undef CONFIG_CMD_NFS #else # define CONFIG_CMD_PING diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 2fd3add..e8e5ae7 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -102,7 +102,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET #define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 2a1915d..547765d 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -15,8 +15,7 @@ #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_BOARD_EARLY_INIT_F - -#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_X86_SERIAL #define CONFIG_SMSC_LPC47M @@ -56,9 +55,6 @@ #define CONFIG_X86_OPTION_ROM_FILE vga.bin #define CONFIG_X86_OPTION_ROM_ADDR 0xfff90000 -#ifndef CONFIG_SYS_COREBOOT -#define CONFIG_VIDEO_VESA -#endif #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO #define CONFIG_VGA_AS_SINGLE_DEVICE diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 4d648c8..96a6b89 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -48,7 +48,6 @@ #define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index d2ef1af..195bc18 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -403,7 +403,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 1c8ada6..fb5fcc6 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -14,7 +14,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SDRAM diff --git a/include/configs/munices.h b/include/configs/munices.h index e65a14a..535bf2a 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -31,7 +31,6 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_ELF #define CONFIG_CMD_IMMAP -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index e377fea..65203a0 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_GPIO #define CONFIG_CMD_LED #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET #define CONFIG_CMD_USB /* Memory configuration */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index b496892..273b7d3 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -16,7 +16,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH #include <config_cmd_default.h> -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index bfbfc68..5f61eb1 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -94,7 +94,6 @@ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f #define CONFIG_MII -#define CONFIG_CMD_NET #define CONFIG_ENV_OVERWRITE /* ESDHC driver */ @@ -127,7 +126,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_BOOTDELAY 1 diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 9daa0bf..bc0ae28 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -28,11 +28,9 @@ #define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_CMD_USB @@ -107,7 +105,6 @@ /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC -#define CONFIG_NET_MULTI #define CONFIG_MX28_FEC_MAC_IN_OCOTP #endif diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 244a9ab..4c71360 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -94,7 +94,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_SPI #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_CMD_DATE diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index fce7ead..e3386ac 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 #define CONFIG_CMD_IDE -#define CONFIG_CMD_NET #define CONFIG_CMD_DATE #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index b0c9717..61e8a98 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -92,7 +92,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET /* USB Configs */ #define CONFIG_CMD_USB diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 7c3dc20..220d4b8 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -68,7 +68,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -79,7 +78,6 @@ #include <config_cmd_default.h> #undef CONFIG_CMD_IMLS -#define CONFIG_CMD_SETEXPR #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 22a9fc4..4af9f7e 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -72,7 +72,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_DATE /* Miscellaneous commands */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index a56e72e..db551a9 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -57,7 +57,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET /* USB Configs */ #define CONFIG_CMD_USB diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 0785491..dcc86b4 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -62,7 +62,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 21c3f96..3f99512 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -31,7 +31,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII @@ -81,7 +80,6 @@ "fi;" /* Command definition */ -#define CONFIG_CMD_SETEXPR #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 20b1f9c..86a0316 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -26,7 +26,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 6a37ae7..c8c9f81 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -32,7 +32,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -56,7 +55,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 2b8bb2a..4b5c637 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 46e1262..63ec7c6 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -140,7 +140,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index 52cde41..8a6d256 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -19,7 +19,6 @@ /* commands */ #include <config_cmd_default.h> -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_NFS diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 9313b9f..beaa119 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -76,7 +76,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -105,7 +104,6 @@ /* Miscellaneous commands */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR /* Framebuffer and LCD */ #define CONFIG_VIDEO diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 152a6e5..d1bb1a1 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -155,7 +155,6 @@ /* commands not needed from config_cmd_default.h */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS /* NFS support */ #undef CONFIG_CMD_SAVEENV /* saveenv */ #undef CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ diff --git a/include/configs/novena.h b/include/configs/novena.h index 1f93269..1dc9d83 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -26,11 +26,9 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_SATA -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_TIME #define CONFIG_CMD_USB #define CONFIG_VIDEO diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index caca98b..a92112f 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -74,7 +74,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #define CONFIG_FIT diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 3874baa..69be496 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -198,7 +198,6 @@ #define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index f25a940..709528b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -109,7 +109,6 @@ #define CONFIG_USB_STORAGE /* USB storage support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_LED /* LED support */ -#define CONFIG_CMD_SETEXPR /* Evaluate expressions */ #define CONFIG_CMD_GPIO /* Enable gpio command */ #define CONFIG_CMD_DHCP diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 2082679..ed79566 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -62,13 +62,11 @@ /* commands to include */ #include <config_cmd_default.h> -#define CONFIG_CMD_SETEXPR /* Evaluate expressions */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Disable some commands */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ /* * TWL4030 diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h index a7acc1b..27cd9be 100644 --- a/include/configs/omap3_evm_quick_mmc.h +++ b/include/configs/omap3_evm_quick_mmc.h @@ -28,7 +28,6 @@ * When revision is statically configured via CONFIG_STATIC_BOARD_REV, * this option can be removed. Generated binary is leaner by ~16Kbytes. */ -#define CONFIG_CMD_NET /* ---------------------------------------------------------------------------- * Supported U-boot features diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h index c6cad93..124e8c6 100644 --- a/include/configs/omap3_evm_quick_nand.h +++ b/include/configs/omap3_evm_quick_nand.h @@ -27,7 +27,6 @@ * When revision is statically configured via CONFIG_STATIC_BOARD_REV, * this option can be removed. Generated binary is leaner by ~16Kbytes. */ -#define CONFIG_CMD_NET /* ---------------------------------------------------------------------------- * Supported U-boot features diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index a5e7d8f..8aecb57 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -75,7 +75,6 @@ #endif #if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020) || \ (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0032) -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #endif #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 13cd35b..6783f68 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -106,10 +106,8 @@ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#define CONFIG_CMD_SETEXPR /* Evaluate expressions */ #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index b61297f..10d1f77 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -124,7 +124,6 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 8d3531c..a8af1c5 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -64,7 +64,6 @@ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images */ -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS /* NFS support */ /* diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 1ca79d4..d97e4d4 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -158,7 +158,6 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NET /* Disabled commands */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 611cd5e..36a52a9 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -82,7 +82,6 @@ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index e97c5e3..3313f96 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -37,7 +37,6 @@ #define CONFIG_CMD_DHCP #include <configs/ti_omap4_common.h> -#define CONFIG_CMD_NET /* GPIO */ #define CONFIG_CMD_GPIO diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 0ca4e82..4215156 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -59,7 +59,6 @@ /* Enabled commands */ #define CONFIG_CMD_DHCP /* DHCP Support */ -#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_NFS /* NFS support */ /* USB Networking options */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 68b4010..91a7413 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -191,7 +191,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_NET_MULTI #endif /* @@ -245,7 +244,6 @@ #endif #ifndef CONFIG_DRIVER_TI_EMAC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_MII #undef CONFIG_CMD_PING diff --git a/include/configs/origen.h b/include/configs/origen.h index 8f1e256..5d43229 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -60,7 +60,6 @@ #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* MMC SPL */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 699b037..2bbf2b9 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -102,7 +102,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -124,7 +123,6 @@ /* Miscellaneous commands */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_PREBOOT "" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a5f9717..b51379e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -775,7 +775,6 @@ #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 /* Defind e1000 pci Ethernet card*/ #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_DOS_PARTITION @@ -906,7 +905,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 9864c15..58dc98a 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -302,11 +302,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_PCIE1_IO_PHYS 0xffc00000 #define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */ -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 /* Defind e1000 pci Ethernet card*/ #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_DOS_PARTITION @@ -314,10 +312,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if defined(CONFIG_TSEC_ENET) -#ifndef CONFIG_NET_MULTI -#define CONFIG_NET_MULTI -#endif - #define CONFIG_MII /* MII PHY management */ #define CONFIG_TSEC1 #define CONFIG_TSEC1_NAME "eTSEC1" @@ -435,7 +429,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_ELF -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 225567b..4433c7c 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -181,7 +181,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/palmld.h b/include/configs/palmld.h index 7dbc9ae..b54c016 100644 --- a/include/configs/palmld.h +++ b/include/configs/palmld.h @@ -52,7 +52,6 @@ */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h index 75506b2..965200a 100644 --- a/include/configs/palmtc.h +++ b/include/configs/palmtc.h @@ -56,7 +56,6 @@ */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_CMD_ENV #define CONFIG_CMD_MMC diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h index bd0f44b..3817815 100644 --- a/include/configs/palmtreo680.h +++ b/include/configs/palmtreo680.h @@ -43,7 +43,6 @@ #include <config_cmd_default.h> #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_FLASH diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 284419f..0bdeccc 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -53,7 +53,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* LCD support */ diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index c0bb227..45c2df6 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -163,10 +163,6 @@ #define CONFIG_USB_ETH_RNDIS #endif /* CONFIG_MUSB_GADGET */ -/* Unsupported features */ -#undef CONFIG_USE_IRQ - -#define CONFIG_NET_MULTI #define CONFIG_PHY_GIGE #define CONFIG_PHYLIB #define CONFIG_PHY_SMSC diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index e6e06f2..3cadf34 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -260,7 +260,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 5ab22e7..fd19461 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -29,7 +29,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_TIME #define CONFIG_CMD_UBI diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 6878ed7..7f7ea97 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -46,7 +46,6 @@ #define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* support the new (FDT-based) image format */ diff --git a/include/configs/porter.h b/include/configs/porter.h index 9703c84..f85d39c 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_NO_FLASH /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 7071849..cf9e2ff 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -135,7 +135,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 @@ -167,11 +166,9 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_CMD_GREPENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h new file mode 100644 index 0000000..78c296f --- /dev/null +++ b/include/configs/qemu-x86.h @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * board/config.h - configuration options, board specific + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/x86-common.h> + +#define CONFIG_SYS_MONITOR_LEN (1 << 20) +#define CONFIG_ARCH_MISC_INIT + +#define CONFIG_X86_SERIAL + +#define CONFIG_PCI_MEM_BUS 0xc0000000 +#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS +#define CONFIG_PCI_MEM_SIZE 0x10000000 + +#define CONFIG_PCI_PREF_BUS 0xd0000000 +#define CONFIG_PCI_PREF_PHYS CONFIG_PCI_PREF_BUS +#define CONFIG_PCI_PREF_SIZE 0x10000000 + +#define CONFIG_PCI_IO_BUS 0x2000 +#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS +#define CONFIG_PCI_IO_SIZE 0xe000 + +#define CONFIG_PCI_CONFIG_HOST_BRIDGE +#define CONFIG_PCI_PNP +#define CONFIG_E1000 + +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga\0" \ + "stdout=serial,vga\0" \ + "stderr=serial,vga\0" + +/* + * ATA/SATA support for QEMU x86 targets + * - Only legacy IDE controller is supported for QEMU '-M pc' target + * - AHCI controller is supported for QEMU '-M q35' target + * + * Default configuraion is to support the QEMU default x86 target + * Undefine CONFIG_CMD_IDE to support q35 target + */ +#define CONFIG_CMD_IDE +#ifdef CONFIG_CMD_IDE +#define CONFIG_SYS_IDE_MAXBUS 2 +#define CONFIG_SYS_IDE_MAXDEVICE 4 +#define CONFIG_SYS_ATA_BASE_ADDR 0 +#define CONFIG_SYS_ATA_DATA_OFFSET 0 +#define CONFIG_SYS_ATA_REG_OFFSET 0 +#define CONFIG_SYS_ATA_ALT_OFFSET 0 +#define CONFIG_SYS_ATA_IDE0_OFFSET 0x1f0 +#define CONFIG_SYS_ATA_IDE1_OFFSET 0x170 +#define CONFIG_ATAPI + +#undef CONFIG_SCSI_AHCI +#undef CONFIG_CMD_SCSI +#else +#define CONFIG_SCSI_DEV_LIST \ + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI} +#endif + +/* GPIO is not supported */ +#undef CONFIG_INTEL_ICH6_GPIO +#undef CONFIG_CMD_GPIO + +/* SPI is not supported */ +#undef CONFIG_ICH_SPI +#undef CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_IS_NOWHERE + +#endif /* __CONFIG_H */ diff --git a/include/configs/qong.h b/include/configs/qong.h index d383fe8..8a9847e 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -119,9 +119,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_SPI #define CONFIG_CMD_UNZIP diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index a71709b..708647e 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -20,7 +20,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_MII #define CONFIG_CMD_NFS diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 24d0c34..5371a65 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_FLASH #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_IDE #define CONFIG_CMD_EXT2 diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 8156724..9c62a04 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_NFS diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index c33f1cb..3845e60 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -18,7 +18,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_RUN #define CONFIG_CMD_LOADS -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 3121ac9..b54cf8b 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -8,12 +8,18 @@ #define _RPI_COMMON_H_ #include <linux/sizes.h> +#include <asm/arch/timer.h> /* Architecture, CPU, etc.*/ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BCM2835 #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_DCACHE_OFF + +#define CONFIG_SYS_TIMER_RATE 1000000 +#define CONFIG_SYS_TIMER_COUNTER \ + (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo) + /* * 2835 is a SKU in a series for which the 2708 is the first or primary SoC, * so 2708 has historically been used rather than a dedicated 2835 ID. diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index e7f7387..fc8e967 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -15,7 +15,6 @@ #define CONFIG_RSK7203 1 #define CONFIG_CMD_FLASH -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 8fadc68..16770f0 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -66,7 +66,6 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_XIMG #define CONFIG_CMD_CACHE diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index bfd8aa7..c4141a0 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -74,7 +74,6 @@ /* Ethernet Hardware */ #define CONFIG_MACB #define CONFIG_RMII -#define CONFIG_NET_MULTI #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY #define CONFIG_RGMII diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 16d2e2d..0c4ca21 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -27,10 +27,8 @@ #define CONFIG_CMD_GPIO #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_USB /* Memory configuration */ diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index 6cac99e..ecb372f 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -32,7 +32,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 78ff651..fdeffb5 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -57,7 +57,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* Enable keyboard */ diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index 72b13a6..114d1fd 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -23,7 +23,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) @@ -36,7 +35,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 2d509a9..d7bc751 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_LDSCRIPT "board/renesas/sh7752evb/u-boot.lds" #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_NFS diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index c31dd7a..2124e0f 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_LDSCRIPT "board/renesas/sh7753evb/u-boot.lds" #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_NFS diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 36afd5f..fd6a1df 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_LDSCRIPT "board/renesas/sh7757lcr/u-boot.lds" #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_NFS diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 2438318..27ad96e 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -20,7 +20,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 2723eaf..9f42ae1 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS #define CONFIG_CMD_SDRAM diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 4d38f6c..8c02afe 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -18,7 +18,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_MEMORY #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS #define CONFIG_CMD_ENV diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index c7affd6..f086e73 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -290,7 +290,6 @@ /* Unsupported features */ #undef CONFIG_USE_IRQ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_DRIVER_TI_CPSW @@ -305,7 +304,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_NET_MULTI #define CONFIG_NAND /* NAND support */ diff --git a/include/configs/silk.h b/include/configs/silk.h index 161e0a5..ccfcede 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_NO_FLASH /* SH Ether */ -#define CONFIG_NET_MULTI #define CONFIG_SH_ETHER #define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_PHY_ADDR 0x1 diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 655025c..d26e5ec 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -45,7 +45,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_ELF #define CONFIG_CMD_DHCP -#define CONFIG_CMD_NET /* MMC SPL */ #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/socfpga_arria5.h b/include/configs/socfpga_arria5.h index b8e1c47..70ee4c9 100644 --- a/include/configs/socfpga_arria5.h +++ b/include/configs/socfpga_arria5.h @@ -31,9 +31,7 @@ #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_USB #define CONFIG_CMD_USB_MASS_STORAGE diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index e742acf..5ba2f6a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -97,7 +97,6 @@ * Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) && !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) -#define CONFIG_NET_MULTI #define CONFIG_DW_ALTDESCRIPTOR #define CONFIG_MII #define CONFIG_AUTONEG_TIMEOUT (15 * CONFIG_SYS_HZ) diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index 1227711..e321381 100644 --- a/include/configs/socfpga_cyclone5.h +++ b/include/configs/socfpga_cyclone5.h @@ -31,9 +31,7 @@ #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NET #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_USB #define CONFIG_CMD_USB_MASS_STORAGE diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 409cf54..30a3f50 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -18,7 +18,6 @@ /* Ethernet driver configuration */ #define CONFIG_MII -#define CONFIG_NET_MULTI #define CONFIG_PHYLIB #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ @@ -109,7 +108,6 @@ #define CONFIG_CMD_MEMORY #define CONFIG_CMD_RUN #define CONFIG_CMD_SAVES -#define CONFIG_CMD_NET #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h index 01085dc..5d51abf 100644 --- a/include/configs/stamp9g20.h +++ b/include/configs/stamp9g20.h @@ -248,7 +248,6 @@ # define CONFIG_CMD_DHCP #else # undef CONFIG_CMD_BOOTD -# undef CONFIG_CMD_NET # undef CONFIG_CMD_NFS #endif /* CONFIG_MACB */ diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index e75e661..888d29c 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -54,7 +54,6 @@ #define CONFIG_MII #define CONFIG_PHYLIB -#define CONFIG_CMD_NET #define CONFIG_DW_ALTDESCRIPTOR #define CONFIG_PHY_MICREL diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index ea079eb..a3c9408 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -18,6 +18,7 @@ #endif #define CONFIG_SUNXI_USB_PHYS 3 +#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18, 19, 20, 21, 22, 24} /* * Include common sunxi configuration where most the settings are diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index d257659..8e13df5 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -19,6 +19,9 @@ #define CONFIG_SUNXI_USB_PHYS 2 +/* \todo A13 only defines port 19, whereas A10s requires each of these */ +#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18, 19} + /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index 2c24bd2..a0ebc7e 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -22,6 +22,13 @@ #define CONFIG_SUNXI_USB_PHYS 3 +#define CONFIG_ARMV7_PSCI 1 +#define CONFIG_ARMV7_PSCI_NR_CPUS 4 +#define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE +#define CONFIG_TIMER_CLK_FREQ 24000000 + +#define CONFIG_NAND_SUNXI_GPC_PORTS {24, 25, 26} + /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 56101a9..3d26ce8 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -24,6 +24,8 @@ #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE #define CONFIG_TIMER_CLK_FREQ 24000000 +#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18, 19, 20, 21, 22, 24} + /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 7111c63..fe8c511 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -20,6 +20,18 @@ #define CONFIG_SUNXI_USB_PHYS 2 +#define CONFIG_ARMV7_PSCI 1 +#if defined(CONFIG_MACH_SUN8I_A23) +#define CONFIG_ARMV7_PSCI_NR_CPUS 2 +#define CONFIG_NAND_SUNXI_GPC_PORTS {16, 17, 18} +#elif defined(CONFIG_MACH_SUN8I_A33) +#define CONFIG_ARMV7_PSCI_NR_CPUS 4 +#define CONFIG_NAND_SUNXI_GPC_PORTS {16} +#else +#error Unsupported sun8i variant +#endif +#define CONFIG_TIMER_CLK_FREQ 24000000 + /* * Include common sunxi configuration where most the settings are */ diff --git a/include/configs/sun9i.h b/include/configs/sun9i.h new file mode 100644 index 0000000..cd9e08d --- /dev/null +++ b/include/configs/sun9i.h @@ -0,0 +1,21 @@ +/* + * (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com> + * + * Configuration settings for the Allwinner A80 (sun9i) CPU + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * A80 specific configuration + */ + +/* + * Include common sunxi configuration where most the settings are + */ +#include <configs/sunxi-common.h> + +#endif /* __CONFIG_H */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index d829899..07db736 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -13,6 +13,8 @@ #ifndef _SUNXI_COMMON_CONFIG_H #define _SUNXI_COMMON_CONFIG_H +#include <linux/stringify.h> + #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT /* * The U-Boot workarounds bugs in the outdated buggy sunxi-3.4 kernels at the @@ -39,8 +41,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ -#define CONFIG_SYS_TEXT_BASE 0x4a000000 - #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_SERIAL) # define CONFIG_DW_SERIAL #endif @@ -69,10 +69,48 @@ /* CPU */ #define CONFIG_SYS_CACHELINE_SIZE 64 -/* DRAM Base */ +/* + * The DRAM Base differs between some models. We cannot use macros for the + * CONFIG_FOO defines which contain the DRAM base address since they end + * up unexpanded in include/autoconf.mk . + * + * So we have to have this #ifdef #else #endif block for these. + */ +#ifdef CONFIG_MACH_SUN9I +#define SDRAM_OFFSET(x) 0x2##x +#define CONFIG_SYS_SDRAM_BASE 0x20000000 +#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* default load address */ +#define CONFIG_SYS_TEXT_BASE 0x2a000000 +#define CONFIG_PRE_CON_BUF_ADDR 0x2f000000 +#define CONFIG_SYS_SPL_MALLOC_START 0x2ff00000 +#define CONFIG_SPL_BSS_START_ADDR 0x2ff80000 +#else +#define SDRAM_OFFSET(x) 0x4##x #define CONFIG_SYS_SDRAM_BASE 0x40000000 +#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* default load address */ +#define CONFIG_SYS_TEXT_BASE 0x4a000000 +#define CONFIG_PRE_CON_BUF_ADDR 0x4f000000 +#define CONFIG_SYS_SPL_MALLOC_START 0x4ff00000 +#define CONFIG_SPL_BSS_START_ADDR 0x4ff80000 +#endif + +#define CONFIG_SPL_BSS_MAX_SIZE 0x00080000 /* 512 KiB */ +#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00080000 /* 512 KiB */ + +#ifdef CONFIG_MACH_SUN9I +/* + * The A80's A1 sram starts at 0x00010000 rather then at 0x00000000 and is + * slightly bigger. Note that it is possible to map the first 32 KiB of the + * A1 at 0x00000000 like with older SoCs by writing 0x16aa0001 to the + * undocumented 0x008000e0 SYS_CTRL register. Where the 16aa is a key and + * the 1 actually activates the mapping of the first 32 KiB to 0x00000000. + */ +#define CONFIG_SYS_INIT_RAM_ADDR 0x10000 +#define CONFIG_SYS_INIT_RAM_SIZE 0x0a000 /* 40 KiB */ +#else #define CONFIG_SYS_INIT_RAM_ADDR 0x0 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 /* 32 KiB */ +#endif #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) @@ -96,7 +134,6 @@ #endif #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_SETEXPR #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG @@ -110,8 +147,10 @@ #define CONFIG_CMD_MMC #define CONFIG_MMC_SUNXI #define CONFIG_MMC_SUNXI_SLOT 0 +#if !defined(CONFIG_SPL_NAND_SUPPORT) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */ +#endif /* CONFIG_SPL_NAND_SUPPORT */ #endif /* 4MB of malloc() pool */ @@ -129,10 +168,8 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_LOAD_ADDR 0x42000000 /* default load address */ - /* standalone support */ -#define CONFIG_STANDALONE_LOAD_ADDR 0x42000000 +#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR /* baudrate */ #define CONFIG_BAUDRATE 115200 @@ -162,16 +199,6 @@ #define CONFIG_SPL_BOARD_LOAD_IMAGE -#ifdef CONFIG_SPL_FEL - -#define CONFIG_SPL_TEXT_BASE 0x2000 -#define CONFIG_SPL_MAX_SIZE 0x4000 /* 16 KiB */ - -#else /* CONFIG_SPL */ - -#define CONFIG_SPL_BSS_START_ADDR 0x4ff80000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KiB */ - #define CONFIG_SPL_TEXT_BASE 0x20 /* sram start+header */ #define CONFIG_SPL_MAX_SIZE 0x5fe0 /* 24KB on sun4i/sun7i */ @@ -186,13 +213,9 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 80 /* 40KiB */ #define CONFIG_SPL_PAD_TO 32768 /* decimal for 'dd' */ -#endif /* CONFIG_SPL */ - /* end of 32 KiB in sram */ #define LOW_LEVEL_SRAM_STACK 0x00008000 /* End of sram */ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK -#define CONFIG_SYS_SPL_MALLOC_START 0x4ff00000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00080000 /* 512 KiB */ /* I2C */ #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER @@ -333,6 +356,24 @@ extern int soft_i2c_gpio_scl; #define CONFIG_ENV_IS_NOWHERE #endif +#ifdef CONFIG_SPL_NAND_SUPPORT +#define CONFIG_NAND +#define CONFIG_SYS_NAND_SELF_INIT +#define CONFIG_NAND_SUNXI +#define CONFIG_CMD_SPL_WRITE_SIZE 0x000400 +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x008000 + +/* \todo Make these parameterisable in kernel config ? */ +#define CONFIG_NAND_SUNXI_PAGE_SIZE 8192 +#define CONFIG_NAND_SUNXI_ECC_STEP 1024 +#define CONFIG_NAND_SUNXI_ECC_STRENGTH 40 +#define CONFIG_NAND_SUNXI_ADDR_CYCLES 5 + +#ifndef CONFIG_NAND_SUNXI_GPC_PORTS +#error "No NAND GPC ports defined, NAND unsupported" +#endif +#endif /* CONFIG_SPL_NAND_SUPPORT */ + #define CONFIG_MISC_INIT_R #define CONFIG_SYS_CONSOLE_IS_IN_ENV @@ -342,8 +383,6 @@ extern int soft_i2c_gpio_scl; /* Enable pre-console buffer to get complete log on the VGA console */ #define CONFIG_PRE_CONSOLE_BUFFER #define CONFIG_PRE_CON_BUF_SZ 4096 /* Aprox 2 80*25 screens */ -/* Use the room between the end of bootm_size and the framebuffer */ -#define CONFIG_PRE_CON_BUF_ADDR 0x4f000000 /* * 240M RAM (256M minimum minus space for the framebuffer), @@ -352,11 +391,11 @@ extern int soft_i2c_gpio_scl; */ #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0xf000000\0" \ - "kernel_addr_r=0x42000000\0" \ - "fdt_addr_r=0x43000000\0" \ - "scriptaddr=0x43100000\0" \ - "pxefile_addr_r=0x43200000\0" \ - "ramdisk_addr_r=0x43300000\0" + "kernel_addr_r=" __stringify(SDRAM_OFFSET(2000000)) "\0" \ + "fdt_addr_r=" __stringify(SDRAM_OFFSET(3000000)) "\0" \ + "scriptaddr=" __stringify(SDRAM_OFFSET(3100000)) "\0" \ + "pxefile_addr_r=" __stringify(SDRAM_OFFSET(3200000)) "\0" \ + "ramdisk_addr_r=" __stringify(SDRAM_OFFSET(3300000)) "\0" #ifdef CONFIG_MMC #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 75609b9..efd76da 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -232,7 +232,6 @@ #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 @@ -284,11 +283,9 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 2d12e86..30bc2be 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -110,7 +110,6 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MII #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_PING diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 13a6e06..e1c9937 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -51,7 +51,6 @@ /* *** Command definition *** */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_MEMTEST #define CONFIG_CMD_TIME @@ -69,7 +68,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h index e726b29..1e74535 100644 --- a/include/configs/tcm-bf518.h +++ b/include/configs/tcm-bf518.h @@ -66,7 +66,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME tcm-bf518 -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 3326580..a8947c5 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -71,7 +71,6 @@ #define CONFIG_NETCONSOLE 1 #endif #define CONFIG_HOSTNAME tcm-bf537 -#define CONFIG_LIB_RAND /* * Flash Settings diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index cfa7fb1..cfee2c3 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -57,7 +57,6 @@ #define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* Tag support */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 13c24c9..3b543eb 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -46,7 +46,6 @@ #define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* LCD support */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 7ae1792..0bac9ad 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -76,7 +76,6 @@ #undef CONFIG_CMD_IMI #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_NFS /* NFS support */ -#undef CONFIG_CMD_NET /* network support */ /* turn on command-line edit/hist/auto */ #define CONFIG_COMMAND_HISTORY diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index dcc2bdc..372a02b 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -216,7 +216,6 @@ #undef CONFIG_USE_IRQ /* Ethernet */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_MII @@ -228,7 +227,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_NET_MULTI #define CONFIG_PHY_GIGE #define CONFIG_PHYLIB #define CONFIG_PHY_ET1011C diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 20a55f4..4d2ae28 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_NS16550_CLK 48000000 /* Network defines. */ -#define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 1c93aab..6c33804 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -79,7 +79,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 /* Per-Soc commands */ -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 3383491..4faffef 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -58,7 +58,6 @@ #define CONFIG_SYS_NS16550_CLK 48000000 /* Per-SoC commands */ -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 7490fa8..49aa3c7 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -43,7 +43,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index e46c580..00294f6 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -107,7 +107,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR @@ -123,7 +122,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE #define CONFIG_CMD_ITEST -#define CONFIG_CMD_SETEXPR #define CONFIG_ENV_SIZE (SZ_8K) /* Size of malloc() pool */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 7426bde..b004d09 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -162,7 +162,6 @@ #define CONFIG_CMD_UBIFS /* UBIFS commands */ #define CONFIG_LZO /* LZO is needed for UBIFS */ -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 81be8a2..848ef33 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -69,7 +69,6 @@ #define CONFIG_RTL8169 /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-post.h" diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 9218533..f3f71f1 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -3,7 +3,7 @@ * * specific parts for B&R T-Series Motherboard * - * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> - + * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> - * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com * * SPDX-License-Identifier: GPL-2.0+ diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 118f5ba..622bd53 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -132,7 +132,6 @@ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f #define CONFIG_MII -#define CONFIG_CMD_NET #define CONFIG_BOARD_LATE_INIT #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/udoo.h b/include/configs/udoo.h index fce2b9b..910bf01 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -39,7 +39,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -52,7 +51,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 331df62..8510472 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,7 +1,5 @@ /* - * Copyright (C) 2012-2015 Panasonic Corporation - * Copyright (C) 2015 Socionext Inc. - * Author: Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -266,8 +264,6 @@ #define CONFIG_SYS_SDRAM_SIZE (CONFIG_SDRAM0_SIZE) #endif -#define CONFIG_SYS_TEXT_BASE 0x84000000 - #if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8) #define CONFIG_SPL_TEXT_BASE 0x00040000 #endif diff --git a/include/configs/vct.h b/include/configs/vct.h index 88e58ec..ed9378e 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -98,7 +98,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP #else -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #endif @@ -312,7 +311,6 @@ int vct_gpio_get(int pin); #undef CONFIG_CMD_LOADY #undef CONFIG_CMD_MII #undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_PING #undef CONFIG_CMD_REGINFO #undef CONFIG_CMD_SNTP diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 4594002..bfe5298 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -60,7 +60,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-usb-gadget.h" diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 62bec99..3f1ebcd 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -44,7 +44,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP /* USB keyboard */ diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 900b89c..8c3774a 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -86,7 +86,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_IMI #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 032010b..b81dfce 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -113,9 +113,6 @@ #endif #endif /* !CONFIG_GICV3 */ -#define CONFIG_SYS_MEMTEST_START V2M_BASE -#define CONFIG_SYS_MEMTEST_END (V2M_BASE + 0x80000000) - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_F_LEN 0x2000 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) @@ -158,7 +155,6 @@ #define CONFIG_CMD_LOADB #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_RUN @@ -182,8 +178,15 @@ /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 (V2M_BASE) /* SDRAM Bank #1 */ -#define PHYS_SDRAM_1_SIZE 0x80000000 /* 2048 MB */ -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +/* Top 16MB reserved for secure world use */ +#define DRAM_SEC_SIZE 0x01000000 +#define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 + +/* Enable memtest */ +#define CONFIG_CMD_MEMTEST +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 +#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE) /* Initial environment variables */ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO @@ -202,6 +205,7 @@ /* Assume we boot with root on the first partition of a USB stick */ #define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \ "root=/dev/sda1 rw " \ + "rootwait "\ "earlyprintk=pl011,0x7ff80000 debug user_debug=31 "\ "loglevel=9" @@ -215,7 +219,7 @@ #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_name=uImage\0" \ + "kernel_name=Image\0" \ "kernel_addr=0x80000000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x88000000\0" \ @@ -229,11 +233,11 @@ "loglevel=9" #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ - "smhload ${fdt_name} $fdt_addr; " \ - "smhload ${initrd_name} $initrd_addr initrd_end; " \ - "fdt addr $fdt_addr; fdt resize; " \ - "fdt chosen $initrd_addr $initrd_end; " \ - "bootm $kernel_addr - $fdt_addr" + "smhload ${fdt_name} ${fdt_addr}; " \ + "smhload ${initrd_name} ${initrd_addr} initrd_end; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "fdt chosen ${initrd_addr} ${initrd_end}; " \ + "booti $kernel_addr - $fdt_addr" #define CONFIG_BOOTDELAY 1 @@ -264,6 +268,7 @@ #define CONFIG_CMD_ARMFLASH #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT #define CONFIG_SYS_FLASH_BASE 0x08000000 #define CONFIG_SYS_FLASH_SIZE 0x04000000 /* 64 MiB */ #define CONFIG_SYS_MAX_FLASH_BANKS 2 diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 989e755..db78c85 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -162,7 +162,6 @@ #define CONFIG_CMD_FLASH #define CONFIG_CMD_IMI #define CONFIG_CMD_MEMORY -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_RUN diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index aa31041..dde65ed 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -90,7 +90,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 3f35076..41680c4 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -114,7 +114,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_MII -#define CONFIG_CMD_NET /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h index bef821f..7dfb6da 100644 --- a/include/configs/vl_ma2sc.h +++ b/include/configs/vl_ma2sc.h @@ -325,7 +325,6 @@ /* Ethernet */ #define CONFIG_MACB #define CONFIG_RMII -#define CONFIG_NET_MULTI #define CONFIG_NET_RETRY_COUNT 5 #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 887433b..0886ba3 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -69,7 +69,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_NET #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS #define CONFIG_CMD_MMC diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 0cc0f03..f05b55a 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -29,7 +29,6 @@ /* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_SETEXPR #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) @@ -58,7 +57,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/warp.h b/include/configs/warp.h index 296ea83..39b4919 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -31,7 +31,6 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* Command definition */ -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* Watchdog */ diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 94f151e..13cc3d3 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -54,7 +54,6 @@ #define CONFIG_USB_ETHER_ASIX /* General networking support */ -#define CONFIG_CMD_NET #define CONFIG_CMD_DHCP #include "tegra-common-post.h" diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index d0895cf..e8eabdb 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -98,7 +98,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_SPI #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_MMC #define CONFIG_DOS_PARTITION diff --git a/include/configs/x600.h b/include/configs/x600.h index 27a66a5..d235da4 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -74,7 +74,6 @@ /* Ethernet config options */ #define CONFIG_MII -#define CONFIG_NET_MULTI #define CONFIG_PHYLIB #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ #define CONFIG_PHY_ADDR 0 /* PHY address */ @@ -114,7 +113,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_RUN #define CONFIG_CMD_SAVES diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index b6a76fe..e0e7fca 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -14,7 +14,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_X86_MRC_ADDR 0xfffa0000 #define CONFIG_CACHE_MRC_SIZE_KB 512 diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 3e21e09..1917d87 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -21,6 +21,7 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_DISPLAY_CPUINFO #define CONFIG_LAST_STAGE_INIT +#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_LMB #define CONFIG_OF_LIBFDT @@ -36,6 +37,7 @@ #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI #define CONFIG_LIBATA +#define CONFIG_LBA48 #define CONFIG_SYS_64BIT_LBA #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 @@ -75,10 +77,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SUPPORT_VFAT -/************************************************************ - * ATAPI support (experimental) - ************************************************************/ -#define CONFIG_ATAPI /************************************************************ * DISK Partition support @@ -122,7 +120,6 @@ #define CONFIG_CMD_LOADS #define CONFIG_CMD_MEMORY #define CONFIG_CMD_MISC -#define CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_CMD_PCI #define CONFIG_CMD_PING @@ -247,6 +244,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ + "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "othbootargs=acpi=off\0" \ diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 0ccd73a..4f62607 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -11,6 +11,9 @@ #ifndef __CONFIG_XLX_H #define __CONFIG_XLX_H + +#define CONFIG_SYS_GENERIC_BOARD + /* #define DEBUG #define ET_DEBUG @@ -35,7 +38,6 @@ #undef CONFIG_CMD_SPI #undef CONFIG_CMD_I2C #undef CONFIG_CMD_DTT -#undef CONFIG_CMD_NET #undef CONFIG_CMD_PING #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_EEPROM diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 15c9176..ea747c8 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -199,7 +199,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_SAVEENV diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 3414230..a762ec0 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -543,7 +543,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index f966a8a..9484ccb 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -324,7 +324,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 988a2e8..0391459 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -396,7 +396,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index ac3f4f1..09c248a 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -380,7 +380,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII #define CONFIG_CMD_NAND -#define CONFIG_CMD_NET #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 9ac4a0f..cc1b960 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -62,7 +62,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII -#define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 1dbbc15..49ca978 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -64,7 +64,6 @@ */ #include <config_cmd_default.h> -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 342fa2c..d57e665 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -78,7 +78,6 @@ * Command line configuration. */ #include <config_cmd_default.h> -#define CONFIG_CMD_NET #define CONFIG_CMD_CACHE /* diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index be77e50..1a52e7d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -48,7 +48,6 @@ /* Ethernet driver */ #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1) -# define CONFIG_NET_MULTI # define CONFIG_ZYNQ_GEM # define CONFIG_MII # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 4d737f4..c7310d7 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -39,20 +39,18 @@ enum uclass_id { UCLASS_PCH, /* x86 platform controller hub */ UCLASS_PCI, /* PCI bus */ UCLASS_PCI_GENERIC, /* Generic PCI bus device */ + UCLASS_PMIC, /* PMIC I/O device */ + UCLASS_REGULATOR, /* Regulator device */ UCLASS_RTC, /* Real time clock device */ UCLASS_SERIAL, /* Serial UART */ UCLASS_SPI, /* SPI bus */ - UCLASS_SPI_GENERIC, /* Generic SPI flash target */ UCLASS_SPI_FLASH, /* SPI flash */ + UCLASS_SPI_GENERIC, /* Generic SPI flash target */ UCLASS_THERMAL, /* Thermal sensor */ UCLASS_USB, /* USB bus */ UCLASS_USB_DEV_GENERIC, /* USB generic device */ UCLASS_USB_HUB, /* USB hub */ - /* Power Management */ - UCLASS_PMIC, /* PMIC I/O device */ - UCLASS_REGULATOR, /* REGULATOR device */ - UCLASS_COUNT, UCLASS_INVALID = -1, }; diff --git a/include/dt-bindings/gpio/x86-gpio.h b/include/dt-bindings/gpio/x86-gpio.h new file mode 100644 index 0000000..7f1de30 --- /dev/null +++ b/include/dt-bindings/gpio/x86-gpio.h @@ -0,0 +1,31 @@ +/* + * This header provides constants for binding intel,x86-pinctrl. + */ + +#ifndef _DT_BINDINGS_GPIO_X86_GPIO_H +#define _DT_BINDINGS_GPIO_X86_GPIO_H + +#include <dt-bindings/gpio/gpio.h> + +#define GPIO_MODE_NATIVE 0 +#define GPIO_MODE_GPIO 1 + +#define GPIO_MODE_FUNC0 0 +#define GPIO_MODE_FUNC1 1 +#define GPIO_MODE_FUNC2 2 +#define GPIO_MODE_FUNC3 3 +#define GPIO_MODE_FUNC4 4 +#define GPIO_MODE_FUNC5 5 +#define GPIO_MODE_FUNC6 6 + +#define PIN_INPUT 0 +#define PIN_OUTPUT 1 + +#define PIN_INPUT_NOPULL 0 +#define PIN_INPUT_PULLUP 1 +#define PIN_INPUT_PULLDOWN 2 + +#define PULL_STR_2K 0 +#define PULL_STR_20K 2 + +#endif diff --git a/include/dt-bindings/interrupt-router/intel-irq.h b/include/dt-bindings/interrupt-router/intel-irq.h new file mode 100644 index 0000000..5092f33 --- /dev/null +++ b/include/dt-bindings/interrupt-router/intel-irq.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DT_BINDINGS_INTEL_IRQ_H_ +#define _DT_BINDINGS_INTEL_IRQ_H_ + +/* PCI interrupt pin */ +#define INTA 1 +#define INTB 2 +#define INTC 3 +#define INTD 4 + +/* PIRQs */ +#define PIRQA 0 +#define PIRQB 1 +#define PIRQC 2 +#define PIRQD 3 +#define PIRQE 4 +#define PIRQF 5 +#define PIRQG 6 +#define PIRQH 7 + +/* PCI bdf encoding */ +#ifndef PCI_BDF +#define PCI_BDF(b, d, f) ((b) << 16 | (d) << 11 | (f) << 8) +#endif + +#endif /* _DT_BINDINGS_INTEL_IRQ_H_ */ diff --git a/include/fdt_support.h b/include/fdt_support.h index 5d4f28d..0edc4fa 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -16,8 +16,35 @@ u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell, const char *prop, const u32 dflt); u32 fdt_getprop_u32_default(const void *fdt, const char *path, const char *prop, const u32 dflt); + +/** + * Add data to the root of the FDT before booting the OS. + * + * See doc/device-tree-bindings/root.txt + * + * @param fdt FDT address in memory + * @return 0 if ok, or -FDT_ERR_... on error + */ +int fdt_root(void *fdt); + +/** + * Add chosen data the FDT before booting the OS. + * + * In particular, this adds the kernel command line (bootargs) to the FDT. + * + * @param fdt FDT address in memory + * @return 0 if ok, or -FDT_ERR_... on error + */ int fdt_chosen(void *fdt); + +/** + * Add initrd information to the FDT before booting the OS. + * + * @param fdt FDT address in memory + * @return 0 if ok, or -FDT_ERR_... on error + */ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end); + void do_fixup_by_path(void *fdt, const char *path, const char *prop, const void *val, int len, int create); void do_fixup_by_path_u32(void *fdt, const char *path, const char *prop, diff --git a/include/fdtdec.h b/include/fdtdec.h index 6bf5f61..4fb8a2a 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -176,8 +176,10 @@ enum fdt_compat_id { COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */ COMPAT_INTEL_ICH_SPI, /* Intel ICH7/9 SPI controller */ COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */ + COMPAT_INTEL_X86_PINCTRL, /* Intel ICH7/9 pin control */ COMPAT_SOCIONEXT_XHCI, /* Socionext UniPhier xHCI */ COMPAT_INTEL_PCH, /* Intel PCH */ + COMPAT_INTEL_IRQ_ROUTER, /* Intel Interrupt Router */ COMPAT_COUNT, }; diff --git a/include/flash.h b/include/flash.h index 48aa3a5..5754cf9 100644 --- a/include/flash.h +++ b/include/flash.h @@ -460,6 +460,7 @@ extern flash_info_t *flash_get_info(ulong base); #define FLASH_S29GL128N 0x00F1 /* Spansion S29GL128N */ #define FLASH_STM32F4 0x00F2 /* STM32F4 Embedded Flash */ +#define FLASH_STM32F1 0x00F3 /* STM32F1 Embedded Flash */ #define FLASH_UNKNOWN 0xFFFF /* unknown flash type */ diff --git a/include/image.h b/include/image.h index 60b924a..b6eb57e 100644 --- a/include/image.h +++ b/include/image.h @@ -244,6 +244,7 @@ struct lmb; #define IH_TYPE_SOCFPGAIMAGE 19 /* Altera SOCFPGA Preloader */ #define IH_TYPE_X86_SETUP 20 /* x86 setup.bin Image */ #define IH_TYPE_LPC32XXIMAGE 21 /* x86 setup.bin Image */ +#define IH_TYPE_LOADABLE 22 /* A list of typeless images */ /* * Compression Types @@ -455,7 +456,31 @@ ulong genimg_get_image(ulong img_addr); int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, uint8_t arch, ulong *rd_start, ulong *rd_end); -#endif + +/** + * boot_get_loadable - routine to load a list of binaries to memory + * @argc: Ignored Argument + * @argv: Ignored Argument + * @images: pointer to the bootm images structure + * @arch: expected architecture for the image + * @ld_start: Ignored Argument + * @ld_len: Ignored Argument + * + * boot_get_loadable() will take the given FIT configuration, and look + * for a field named "loadables". Loadables, is a list of elements in + * the FIT given as strings. exe: + * loadables = "linux_kernel@1", "fdt@2"; + * this function will attempt to parse each string, and load the + * corresponding element from the FIT into memory. Once placed, + * no aditional actions are taken. + * + * @return: + * 0, if only valid images or no images are found + * error code, if an error occurs during fit_image_load + */ +int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images, + uint8_t arch, const ulong *ld_start, ulong * const ld_len); +#endif /* !USE_HOSTCC */ int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch, ulong *setup_start, ulong *setup_len); @@ -742,6 +767,7 @@ int bootz_setup(ulong image, ulong *start, ulong *end); #define FIT_KERNEL_PROP "kernel" #define FIT_RAMDISK_PROP "ramdisk" #define FIT_FDT_PROP "fdt" +#define FIT_LOADABLE_PROP "loadables" #define FIT_DEFAULT_PROP "default" #define FIT_SETUP_PROP "setup" diff --git a/include/linux/io.h b/include/linux/io.h new file mode 100644 index 0000000..1b36a22 --- /dev/null +++ b/include/linux/io.h @@ -0,0 +1,10 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _LINUX_IO_H +#define _LINUX_IO_H + +#include <asm/io.h> + +#endif /* _LINUX_IO_H */ diff --git a/include/os.h b/include/os.h index ffbdce8..954a48c 100644 --- a/include/os.h +++ b/include/os.h @@ -112,6 +112,14 @@ void os_exit(int exit_code) __attribute__((noreturn)); void os_tty_raw(int fd, bool allow_sigs); /** + * Restore the tty to its original mode + * + * Call this to restore the original terminal mode, after it has been changed + * by os_tty_raw(). This is an internal function. + */ +void os_fd_restore(void); + +/** * Acquires some memory from the underlying os. * * \param length Number of bytes to be allocated diff --git a/include/pci_ids.h b/include/pci_ids.h index 2e66851..5771e12 100644 --- a/include/pci_ids.h +++ b/include/pci_ids.h @@ -2838,6 +2838,7 @@ #define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930 #define PCI_DEVICE_ID_INTEL_ICH9_7 0x2916 #define PCI_DEVICE_ID_INTEL_ICH9_8 0x2918 +#define PCI_DEVICE_ID_INTEL_ICH9_AHCI 0x2922 #define PCI_DEVICE_ID_INTEL_I7_MCR 0x2c18 #define PCI_DEVICE_ID_INTEL_I7_MC_TAD 0x2c19 #define PCI_DEVICE_ID_INTEL_I7_MC_RAS 0x2c1a diff --git a/include/version.h b/include/version.h index d6c7cf2..777e9f6 100644 --- a/include/version.h +++ b/include/version.h @@ -19,7 +19,7 @@ #endif #define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \ - U_BOOT_TIME ")" CONFIG_IDENT_STRING + U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING #ifndef __ASSEMBLY__ extern const char version_string[]; |