mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipq806x: Disable relocation in uboot-2016

Browse source 
This change will resolve the "L2 Master port decode error"
 print in the Kernel log.

Change-Id: I12fd39a85093cc1d7fab336898e039a61eeb5565
Signed-off-by: sameeruddin shaik <samesh@codeaurora.org>
This commit is contained in:
sameeruddin shaik 2018-10-29 16:52:58 +05:30
parent df527e6248
commit f2741fbe5a
7 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/include/asm/system.h
View file

@ -240,6 +240,8 @@ enum dcache_option {
DCACHE_WRITETHROUGH = DCACHE_OFF | TTB_SECT_C_MASK,
DCACHE_WRITEBACK = DCACHE_WRITETHROUGH | TTB_SECT_B_MASK,
DCACHE_WRITEALLOC = DCACHE_WRITEBACK | TTB_SECT_TEX(1),
SHARED_DEVICE = TTB_SECT_B_MASK | TTB_SECT_S_MASK | TTB_SECT_DOMAIN(0) |
TTB_SECT_XN_MASK | TTB_SECT,
};
#else
/* options available for data cache on each page */
@ -248,6 +250,10 @@ enum dcache_option {
DCACHE_WRITETHROUGH = 0x1a,
DCACHE_WRITEBACK = 0x1e,
DCACHE_WRITEALLOC = 0x16,
/* Regions other than DDR has to be marked as "shared device"
* They have B bit set, C bit unset, S(hared) bit set, XN bit set
*/
SHARED_DEVICE = 0x10016,
};
#endif

5
arch/arm/lib/cache-cp15.c
View file

@ -62,7 +62,7 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size,
mmu_page_table_flush((u32)&page_table[start], (u32)&page_table[end]);
}
#if defined(CONFIG_ARCH_IPQ40xx) || defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ6018)
#if defined(CONFIG_IPQ_NO_RELOC)
#define UBOOT_CACHE_SETUP 0x100e
#define GEN_CACHE_SETUP 0x101e
@ -90,9 +90,10 @@ void mmu_setup(void)
u32 reg;
arm_init_before_mmu();
memset(gd->arch.tlb_addr, 0, gd->arch.tlb_size);
/* Set up an identity-mapping for all 4GB, rw for everyone */
for (i = 0; i < 4096; i++)
set_section_dcache(i, DCACHE_WRITEALLOC);
set_section_dcache(i, SHARED_DEVICE);
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
dram_bank_mmu_setup(i);

4
arch/arm/lib/crt0.S
View file

@ -86,7 +86,7 @@ ENTRY(_main)
bl board_init_f_mem
mov sp, r0
#if defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ40xx) || defined(CONFIG_ARCH_IPQ6018)
#if defined(CONFIG_IPQ_NO_RELOC) || defined(CONFIG_ARCH_IPQ6018)
ldr r0, =__bss_start /* this is auto-relocated! */
#ifdef CONFIG_USE_ARCH_MEMSET
@ -156,7 +156,7 @@ here:
cmp r0, #0
movne sp, r0
# endif
#if !defined(CONFIG_ARCH_IPQ807x) && !defined(CONFIG_ARCH_IPQ40xx) && !defined(CONFIG_ARCH_IPQ6018)
#if !defined(CONFIG_IPQ_NO_RELOC) && !defined(CONFIG_ARCH_IPQ6018)
ldr r0, =__bss_start /* this is auto-relocated! */
#ifdef CONFIG_USE_ARCH_MEMSET

2
common/board_f.c
View file

@ -1062,7 +1062,7 @@ void board_init_f(ulong boot_flags)
gd->flags = boot_flags;
gd->have_console = 0;
#if defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ40xx) || defined(CONFIG_ARCH_IPQ6018)
#if defined(CONFIG_IPQ_NO_RELOC)
gd->flags |= GD_FLG_SKIP_RELOC;
#endif

1
include/configs/ipq40xx.h
View file

@ -25,6 +25,7 @@
#endif
#define CONFIG_IPQ40XX
#define CONFIG_IPQ_NO_RELOC
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_CACHELINE_SIZE 64

9
include/configs/ipq806x.h
View file

@ -34,6 +34,7 @@
#endif /* !DO_DEPS_ONLY */
#define CONFIG_IPQ806X
#define CONFIG_IPQ_NO_RELOC
#define CONFIG_SMP_CMD_SUPPORT
#ifdef CONFIG_SMP_CMD_SUPPORT
#define NR_CPUS 2
@ -43,7 +44,7 @@
#define CONFIG_SYS_CACHELINE_SIZE 64
#define CONFIG_IPQ806X_ENV
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
#define CONFIG_IPQ_FDT_HIGH 0x48000000
#define CONFIG_IPQ_FDT_HIGH 0xffffffff
#define CONFIG_BOOTARGS "console=ttyMSM0,115200n8"
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_VSNPRINTF
@ -132,7 +133,7 @@
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define CONFIG_SYS_TEXT_BASE 0x41200000
#define CONFIG_SYS_TEXT_BASE 0x42000000
#define CONFIG_SYS_SDRAM_SIZE 0x10000000
#define CONFIG_MAX_RAM_BANK_SIZE CONFIG_SYS_SDRAM_SIZE
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (64 << 20))
@ -244,7 +245,9 @@ typedef struct {
#define IPQ_TEMP_DUMP_ADDR (IPQ_MEM_RESERVE_BASE(nsstcmdump))
#define IPQ_TFTP_MIN_ADDR (CONFIG_SYS_SDRAM_BASE + (32 << 20))
#define IPQ_TFTP_MAX_ADDR (gd->start_addr_sp - (4 << 20))
#define IPQ_TFTP_MAX_ADDR (gd->bd->bi_dram[0].start + \
gd->bd->bi_dram[0].size)
#define CONFIG_QCA_SMEM_BASE CONFIG_SYS_SDRAM_BASE + 0x1000000
#endif /* __ASSEMBLY__ */

1
include/configs/ipq807x.h
View file

@ -29,6 +29,7 @@
*/
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_IPQ_NO_RELOC
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_CACHELINE_SIZE 64