Skip to content
Snippets Groups Projects
Commit 7f5c0157 authored by Jon Loeliger's avatar Jon Loeliger
Browse files

include/configs/[g-o]*: Cleanup BOOTP and lingering CFG_CMD_*.


Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
parent 80ff4f99
Branches
Tags
No related merge requests found
Showing
with 186 additions and 5 deletions
...@@ -72,6 +72,15 @@ ...@@ -72,6 +72,15 @@
#define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;run addmisc;bootm" #define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;run addmisc;bootm"
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -51,6 +51,15 @@ ...@@ -51,6 +51,15 @@
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
...@@ -242,8 +251,7 @@ ...@@ -242,8 +251,7 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
/* /*
* Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined, * Enable loopw command.
* which is normally part of the default commands (CFV_CMD_DFL)
*/ */
#define CONFIG_LOOPW #define CONFIG_LOOPW
......
...@@ -173,6 +173,15 @@ ...@@ -173,6 +173,15 @@
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -79,6 +79,15 @@ ...@@ -79,6 +79,15 @@
"" ""
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -82,6 +82,15 @@ ...@@ -82,6 +82,15 @@
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -72,6 +72,15 @@ ...@@ -72,6 +72,15 @@
#define CONFIG_ISO_PARTITION #define CONFIG_ISO_PARTITION
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
...@@ -259,8 +268,7 @@ ...@@ -259,8 +268,7 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */ #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
/* /*
* Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined, * Enable loopw command.
* which is normally part of the default commands (CFV_CMD_DFL)
*/ */
#define CONFIG_LOOPW #define CONFIG_LOOPW
......
...@@ -55,6 +55,15 @@ ...@@ -55,6 +55,15 @@
#define CONFIG_MISC_INIT_R 1 /* we have a misc_init_r() function */ #define CONFIG_MISC_INIT_R 1 /* we have a misc_init_r() function */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -54,6 +54,15 @@ ...@@ -54,6 +54,15 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -76,6 +76,15 @@ ...@@ -76,6 +76,15 @@
#define CFG_IXP425_CONSOLE IXP425_UART1 /* we use UART1 for console */ #define CFG_IXP425_CONSOLE IXP425_UART1 /* we use UART1 for console */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
#define CONFIG_PCI_IO_BUS 0x50000000 #define CONFIG_PCI_IO_BUS 0x50000000
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0x01000000 #define CONFIG_PCI_IO_SIZE 0x01000000
#define ADD_PCI_CMD CFG_CMD_PCI
#endif #endif
#define CFG_XLB_PIPELINING 1 #define CFG_XLB_PIPELINING 1
...@@ -83,6 +82,15 @@ ...@@ -83,6 +82,15 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */ #define CONFIG_TIMESTAMP /* Print image info with timestamp */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
...@@ -91,6 +99,10 @@ ...@@ -91,6 +99,10 @@
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#if defined(CONFIG_PCI)
#define CODFIG_CMD_PCI
#endif
/* /*
* Autobooting * Autobooting
......
...@@ -79,6 +79,15 @@ ...@@ -79,6 +79,15 @@
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -60,6 +60,15 @@ ...@@ -60,6 +60,15 @@
#define CONFIG_BAUDRATE 9600 #define CONFIG_BAUDRATE 9600
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -55,6 +55,15 @@ ...@@ -55,6 +55,15 @@
#undef CONFIG_MISC_INIT_R /* FIXME: misc_init_r() missing */ #undef CONFIG_MISC_INIT_R /* FIXME: misc_init_r() missing */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -56,6 +56,15 @@ ...@@ -56,6 +56,15 @@
#define CONFIG_TIMESTAMP 1 /* Print timestamp info for images */ #define CONFIG_TIMESTAMP 1 /* Print timestamp info for images */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -56,6 +56,15 @@ ...@@ -56,6 +56,15 @@
#define CONFIG_TIMESTAMP 1 /* Print timestamp info for images */ #define CONFIG_TIMESTAMP 1 /* Print timestamp info for images */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -214,6 +214,15 @@ ...@@ -214,6 +214,15 @@
#endif #endif
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -68,6 +68,15 @@ ...@@ -68,6 +68,15 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -92,6 +92,15 @@ ...@@ -92,6 +92,15 @@
#define CONFIG_AUTO_UPDATE 1 #define CONFIG_AUTO_UPDATE 1
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -87,6 +87,15 @@ ...@@ -87,6 +87,15 @@
#endif #endif
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
...@@ -88,6 +88,15 @@ ...@@ -88,6 +88,15 @@
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
/* /*
* Command line configuration. * Command line configuration.
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment