diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/phycore_mpc5200b_tiny.h | 6 | ||||
| -rw-r--r-- | include/image.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/configs/phycore_mpc5200b_tiny.h b/include/configs/phycore_mpc5200b_tiny.h index b2354d7031..00fcf17f9f 100644 --- a/include/configs/phycore_mpc5200b_tiny.h +++ b/include/configs/phycore_mpc5200b_tiny.h @@ -54,9 +54,6 @@ Serial console configuration #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> - #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ #if (TEXT_BASE == 0xFF000000) /* Boot low */ @@ -68,9 +65,6 @@ Serial console configuration Autobooting ------------------------------------------------------------------------------------------------------------------------------------------------------*/ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process even with bootdelay=0 */ -#undef CONFIG_BOOTARGS - #define CONFIG_PREBOOT "echo;" \ "echo Type \"run net_nfs\" to load Kernel over TFTP and to mount root filesystem over NFS;" \ diff --git a/include/image.h b/include/image.h index 1cfb76631b..98f154c981 100644 --- a/include/image.h +++ b/include/image.h @@ -158,5 +158,6 @@ typedef struct image_header { /* common/cmd_bootm.c */ void print_image_hdr (image_header_t *hdr); +extern image_header_t header; #endif /* __IMAGE_H__ */ |