X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fintegrator-common.h;h=34eec5a33d258ceef6bb8dd97ad3255fc6c64dda;hb=bf2c48fa1a6e068f232d84aae43b5dad654a9017;hp=cf988341263dd9e3aa1006a0c1eed21d83d58e50;hpb=df6cf3d809fe543651e6bdf133baaa8b9841fe0f;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index cf98834..34eec5a 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -8,36 +8,6 @@ #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS - -/* - * There are various dependencies on the core module (CM) fitted - * Users should refer to their CM user guide - */ -#include "armcoremodule.h" - -/* - * Initialize and remap the core module, use SPD to detect memory size - * If CONFIG_SKIP_LOWLEVEL_INIT is not defined & - * the core module has a CM_INIT register - * then the U-Boot initialisation code will - * e.g. ARM Boot Monitor or pre-loader is repeated once - * (to re-initialise any existing CM_INIT settings to safe values). - * - * This is usually not the desired behaviour since the platform - * will either reboot into the ARM monitor (or pre-loader) - * or continuously cycle thru it without U-Boot running, - * depending upon the setting of Integrator/CP switch S2-4. - * - * However it may be needed if Integrator/CP switch S2-1 - * is set OFF to boot direct into U-Boot. - * In that case comment out the line below. - */ -#define CONFIG_CM_INIT -#define CONFIG_CM_REMAP -#define CONFIG_CM_SPD_DETECT - /* * The ARM boot monitor initializes the board. * However, the default U-Boot code also performs the initialization. @@ -61,11 +31,6 @@ #define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET /* * FLASH and environment organization @@ -77,7 +42,6 @@ * - U-Boot environment */ #define CONFIG_SYS_FLASH_BASE 0x24000000 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* Timeout values in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */