X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fppmc7xx.h;h=5cd660927a81626919fe19cf86a8d9f6fac48003;hb=b7e3129e550957f046c29a917c63f4b503fbfcb9;hp=09bf4e48ff63382154ef557c57259a23c139a95b;hpb=d48455ad8cefd25d7b49f68fd16d0e9fd551732a;p=u-boot diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index 09bf4e48ff..5cd660927a 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -51,6 +51,10 @@ #define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#ifndef __ASSEMBLY__ +#include +#endif + /* * Monitor configuration * @@ -121,12 +125,10 @@ /* * Network config * - * CONFIG_NET_MULTI - Support for multiple network interfaces * CONFIG_EEPRO100 - Intel 8255x Ethernet Controller * CONFIG_EEPRO100_SROM_WRITE - Enable writing to network card ROM */ -#define CONFIG_NET_MULTI #define CONFIG_EEPRO100 #define CONFIG_EEPRO100_SROM_WRITE @@ -297,15 +299,14 @@ * copied to top of RAM by the init code. * * CONFIG_SYS_INIT_RAM_ADDR - Address of Init RAM, above exception vect - * CONFIG_SYS_INIT_RAM_END - Size of Init RAM - * CONFIG_SYS_GBL_DATA_SIZE - Ammount of RAM to reserve for global data + * CONFIG_SYS_INIT_RAM_SIZE - Size of Init RAM + * GENERATED_GBL_DATA_SIZE - Ammount of RAM to reserve for global data * CONFIG_SYS_GBL_DATA_OFFSET - Start of global data, top of stack */ #define CONFIG_SYS_INIT_RAM_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4000) -#define CONFIG_SYS_INIT_RAM_END 0x4000 -#define CONFIG_SYS_GBL_DATA_SIZE 128 -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_RAM_SIZE 0x4000 +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) /* @@ -367,7 +368,6 @@ /* * Serial port config * - * CONFIG_SYS_BAUDRATE_TABLE - List of valid baud rates * CONFIG_SYS_NS16550 - Include the NS16550 driver * CONFIG_SYS_NS16550_SERIAL - Include the serial (wrapper) driver * CONFIG_SYS_NS16550_CLK - Frequency of reference clock @@ -375,7 +375,6 @@ * CONFIG_SYS_NS16550_COM1 - Base address of 1st serial port */ -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_CLK 3686400 @@ -415,16 +414,4 @@ #define CONFIG_SYS_BOARD_ASM_INIT - -/* - * Boot flags - * - * BOOTFLAG_COLD - Indicates a power-on boot - * BOOTFLAG_WARM - Indicates a software reset - */ - -#define BOOTFLAG_COLD 0x01 -#define BOOTFLAG_WARM 0x02 - - #endif /* __CONFIG_H */