X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fo2dnt-common.h;h=e2881a7177b94fe7fe708f5d2397d63f283b8b7c;hb=4f66e09bb9fbc47b73f67c3cc08ee2663e8fcdb1;hp=18388d150b65ee51a94c47d996abcc0ed110fa8a;hpb=3deb013ae780c19f40b0704a7f421ad479962618;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 18388d1..e2881a7 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -17,8 +17,6 @@ * High Level Configuration Options */ #define CONFIG_MPC5200 -#define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* running at 33.000000MHz */ @@ -42,7 +40,6 @@ * Serial console configuration */ #define CONFIG_PSC_CONSOLE 5 /* console is on PSC5 */ -#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 9600, 19200, 38400, 57600, 115200, 230400 } @@ -51,8 +48,6 @@ * 0x40000000 - 0x4fffffff - PCI Memory * 0x50000000 - 0x50ffffff - PCI IO Space */ -#undef CONFIG_PCI -#define CONFIG_PCI_PNP 1 #define CONFIG_PCI_MEM_BUS 0x40000000 #define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS @@ -65,9 +60,6 @@ #define CONFIG_SYS_XLB_PIPELINING 1 /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_TIMESTAMP /* Print image info with timestamp */ @@ -76,20 +68,10 @@ /* * Supported commands */ -#include - #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_FAT -#define CONFIG_CMD_I2C -#define CONFIG_CMD_MII -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP #ifdef CONFIG_PCI #define CONFIG_CMD_PCI #endif -#ifdef CONFIG_POST -#define CONFIG_CMD_DIAG -#endif #if (CONFIG_SYS_TEXT_BASE == 0xFC000000) || (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 or 32 MB Flash */ @@ -98,26 +80,13 @@ #error "CONFIG_SYS_TEXT_BASE value is invalid" #endif -/* - * Autobooting - * Be selective on what keys can delay or stop the autoboot process - * To stop use: "++++++++++" - */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ - "press password to stop\n", bootdelay -#define CONFIG_AUTOBOOT_STOP_STR "++++++++++" -#undef CONFIG_AUTOBOOT_DELAY_STR -#define DEBUG_BOOTKEYS 0 - -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_PREBOOT "run master" #undef CONFIG_BOOTARGS -#if !defined(CONFIG_CONSOLE_DEV) -#define CONFIG_CONSOLE_DEV "ttyPSC1" +#if !defined(CONSOLE_DEV) +#define CONSOLE_DEV "ttyPSC1" #endif /* @@ -152,7 +121,7 @@ "addmem=setenv bootargs ${bootargs} ${memlimit}\0" \ "addmisc=sete bootargs ${bootargs} ${miscargs}\0" \ "addtty=sete bootargs ${bootargs} console=" \ - CONFIG_CONSOLE_DEV ",${baudrate}\0" \ + CONSOLE_DEV ",${baudrate}\0" \ "bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0" \ "kernel_addr_r=600000\0" \ "initrd_high=0x03e00000\0" \ @@ -268,13 +237,13 @@ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM #ifdef CONFIG_POST /* preserve space for the post_word at end of on-chip SRAM */ -#define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_POST_SIZE +#define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_POST_SIZE #else /* End of used area in DPRAM */ -#define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE +#define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE #endif -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \ +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET @@ -308,7 +277,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ @@ -347,9 +315,6 @@ /* * DT support */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4)