Merge branch 'master' of git://git.denx.de/u-boot-samsung
This commit is contained in:
commit
41060bc58f
@ -82,13 +82,19 @@ int board_init(void)
|
|||||||
}
|
}
|
||||||
boot_temp_check();
|
boot_temp_check();
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef CONFIG_TZSW_RESERVED_DRAM_SIZE
|
||||||
|
/* The last few MB of memory can be reserved for secure firmware */
|
||||||
|
ulong size = CONFIG_TZSW_RESERVED_DRAM_SIZE;
|
||||||
|
|
||||||
|
gd->ram_size -= size;
|
||||||
|
gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= size;
|
||||||
|
#endif
|
||||||
return exynos_init();
|
return exynos_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
int i;
|
unsigned int i;
|
||||||
u32 addr;
|
u32 addr;
|
||||||
|
|
||||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
||||||
@ -100,7 +106,7 @@ int dram_init(void)
|
|||||||
|
|
||||||
void dram_init_banksize(void)
|
void dram_init_banksize(void)
|
||||||
{
|
{
|
||||||
int i;
|
unsigned int i;
|
||||||
u32 addr, size;
|
u32 addr, size;
|
||||||
|
|
||||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
||||||
|
@ -427,10 +427,6 @@ int exynos_early_init_f(void)
|
|||||||
|
|
||||||
int exynos_init(void)
|
int exynos_init(void)
|
||||||
{
|
{
|
||||||
/* The last MB of memory is reserved for secure firmware */
|
|
||||||
gd->ram_size -= SZ_1M;
|
|
||||||
gd->bd->bi_dram[CONFIG_NR_DRAM_BANKS - 1].size -= SZ_1M;
|
|
||||||
|
|
||||||
board_gpio_init();
|
board_gpio_init();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -29,6 +29,9 @@
|
|||||||
#define CONFIG_SYS_SDRAM_BASE 0x40000000
|
#define CONFIG_SYS_SDRAM_BASE 0x40000000
|
||||||
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
|
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
|
||||||
#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
|
#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
|
||||||
|
/* Reserve the last 1 MiB for the secure firmware */
|
||||||
|
#define CONFIG_SYS_MEM_TOP_HIDE (1UL << 20UL)
|
||||||
|
#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
|
||||||
|
|
||||||
/* memtest works on */
|
/* memtest works on */
|
||||||
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
|
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
|
||||||
@ -56,8 +59,6 @@
|
|||||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
|
||||||
- GENERATED_GBL_DATA_SIZE)
|
- GENERATED_GBL_DATA_SIZE)
|
||||||
|
|
||||||
#define CONFIG_SYS_MEM_TOP_HIDE (SZ_1M) /* ram console */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_BASE 0x00000000
|
#define CONFIG_SYS_MONITOR_BASE 0x00000000
|
||||||
|
|
||||||
#define CONFIG_ENV_IS_IN_MMC
|
#define CONFIG_ENV_IS_IN_MMC
|
||||||
|
@ -25,13 +25,11 @@
|
|||||||
|
|
||||||
#define CONFIG_CMD_MMC
|
#define CONFIG_CMD_MMC
|
||||||
|
|
||||||
/*
|
#define CONFIG_NR_DRAM_BANKS 8
|
||||||
* FIXME: The number of bank is actually 8. But there is no way to reserve the
|
|
||||||
* last 16 Mib in the last bank now. So I just excluded the last bank
|
|
||||||
* temporally.
|
|
||||||
*/
|
|
||||||
#define CONFIG_NR_DRAM_BANKS 7
|
|
||||||
#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
|
#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
|
||||||
|
/* Reserve the last 22 MiB for the secure firmware */
|
||||||
|
#define CONFIG_SYS_MEM_TOP_HIDE (22UL << 20UL)
|
||||||
|
#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
|
||||||
|
|
||||||
#define CONFIG_ENV_IS_IN_MMC
|
#define CONFIG_ENV_IS_IN_MMC
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user