diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-17 09:09:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-17 09:09:40 -0400 |
| commit | 103c45fb0daab924308046454b4aaad4a09237c4 (patch) | |
| tree | dced5f70fb2e8dc9163f9884b518a4cf7c146441 /include/configs | |
| parent | a715415bb5948c84cc44c601b193188990f7238b (diff) | |
| parent | 891bf67611e93df3f3a6c451d945a7810435ed13 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/draak.h | 6 | ||||
| -rw-r--r-- | include/configs/ebisu.h | 4 | ||||
| -rw-r--r-- | include/configs/rcar-gen2-common.h | 3 | ||||
| -rw-r--r-- | include/configs/rcar-gen3-common.h | 3 | ||||
| -rw-r--r-- | include/configs/salvator-x.h | 4 | ||||
| -rw-r--r-- | include/configs/ulcb.h | 4 |
6 files changed, 5 insertions, 19 deletions
diff --git a/include/configs/draak.h b/include/configs/draak.h index e0a5344fbe..e1b9bf1885 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -15,16 +15,12 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 33333333u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index 560fe5c45e..2e4974acb2 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -18,10 +18,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 48000000u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 231c4ecea4..e1b2fa28e1 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -33,7 +33,8 @@ #define CONFIG_SYS_SDRAM_BASE (RCAR_GEN2_SDRAM_BASE) #define CONFIG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fc0) +#define CONFIG_SYS_LOAD_ADDR 0x50000000 +#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MONITOR_BASE 0x00000000 diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index af7b196dc1..07f08db4fe 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -42,7 +42,8 @@ #define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CONFIG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x48080000 +#define CONFIG_SYS_LOAD_ADDR 0x58000000 +#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index ecc6c5d80d..1bf2234918 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -15,10 +15,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 33333333u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index 86c6ed3a36..6f2a0cc56d 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -15,10 +15,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 33333333u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ |