X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fmpc7448hpc2.h;h=3e7377511cea5a63d72d6c221aaec16b8af13a32;hb=008ec95054c170859e7a2dfdf87ce15e2e6cd017;hp=ae5e1098f6891337994f3eed1bc3d6f88d0b7959;hpb=2ae1824196884ba2bafffb7c0d3e8297350591e9;p=oweals%2Fu-boot.git diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index ae5e1098f6..3e7377511c 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -54,6 +54,10 @@ #undef CONFIG_ECC /* disable ECC support */ +#ifndef __ASSEMBLY__ +#include +#endif + /* Board-specific Initialization Functions to be called */ #define CONFIG_SYS_BOARD_ASM_INIT #define CONFIG_BOARD_EARLY_INIT_F @@ -128,9 +132,8 @@ #define CONFIG_TSI108_ETH #define CONFIG_TSI108_ETH_NUM_PORTS 2 -#define CONFIG_NET_MULTI -#define CONFIG_BOOTFILE zImage.initrd.elf +#define CONFIG_BOOTFILE "zImage.initrd.elf" #define CONFIG_LOADADDR 0x400000 /*-------------------------------------------------------------------------- */ @@ -221,10 +224,9 @@ */ #undef CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0x07d00000 /* unused memory region */ -#define CONFIG_SYS_INIT_RAM_END 0x4000/* larger space - we have SDRAM initialized */ +#define CONFIG_SYS_INIT_RAM_SIZE 0x4000/* larger space - we have SDRAM initialized */ -#define CONFIG_SYS_GBL_DATA_SIZE 128/* size in bytes reserved for init data */ -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) /*----------------------------------------------------------------------- * Start addresses for the final memory configuration @@ -401,13 +403,5 @@ #define L2_INIT 0 #define L2_ENABLE (L2_INIT | L2CR_L2E) - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ #define CONFIG_SYS_SERIAL_HANG_IN_EXCEPTION #endif /* __CONFIG_H */