X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fhelios4.h;h=f0ca8e2f16174db5da38d0000da0a62866563916;hb=6d7dacf726ca043a3f5487549bbfa506c990c813;hp=b2badab15eab25f82ca14057125d23e4a6bd8960;hpb=0a5228be868622894a5f8f226203cd7bac562187;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/helios4.h b/include/configs/helios4.h index b2badab..f0ca8e2 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -44,22 +44,14 @@ #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI /* Environment in SPI NOR flash */ -#define CONFIG_ENV_SECT_SIZE SZ_64K -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_OFFSET SZ_1M #endif #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC /* Environment in MMC */ #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_SECT_SIZE 0x200 -#define CONFIG_ENV_SIZE 0x2000 /* stay within first 1M */ -#define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE) -#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET #endif -#define CONFIG_PHY_MARVELL /* there is a marvell phy */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* Keep device tree and initrd in lower memory so the kernel can access them */ @@ -87,7 +79,6 @@ /* Defines for SPL */ #define CONFIG_SPL_SIZE (140 << 10) -#define CONFIG_SPL_TEXT_BASE 0x40000030 #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - 0x0030) #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE) @@ -101,17 +92,11 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH -/* SPL related SPI defines */ -#define CONFIG_SPL_SPI_FLASH_SUPPORT -#define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x30000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD /* SPL related MMC defines */ -#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS #ifdef CONFIG_SPL_BUILD