diff options
109 files changed, 456 insertions, 523 deletions
diff --git a/api/api_storage.c b/api/api_storage.c index e80818d..a5357bc 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -331,10 +331,14 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start if (!dev_stor_is_valid(type, dd)) return 0; +#ifdef CONFIG_BLK + return blk_dread(dd, start, len, buf); +#else if ((dd->block_read) == NULL) { debugf("no block_read() for device 0x%08x\n", cookie); return 0; } return dd->block_read(dd, start, len, buf); +#endif /* defined(CONFIG_BLK) */ } diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 08d7d1b..907c693 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -120,7 +120,7 @@ endif # limit ourselves to the sections we want in the .bin. ifdef CONFIG_ARM64 OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \ - -j .u_boot_list -j .rela.dyn + -j .u_boot_list -j .rela.dyn -j .got -j .got.plt else OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \ -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c index e8ba1ae..1edb1a4 100644 --- a/arch/arm/cpu/arm720t/interrupts.c +++ b/arch/arm/cpu/arm720t/interrupts.c @@ -12,12 +12,6 @@ #include <common.h> -#ifdef CONFIG_USE_IRQ -void do_irq (struct pt_regs *pt_regs) -{ -} -#endif - #if defined(CONFIG_TEGRA) static ulong timestamp; static ulong lastdec; diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index 7aa432a..8faf34b 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -8,7 +8,6 @@ extra-y = start.o obj-y += cpu.o -obj-$(CONFIG_USE_IRQ) += interrupts.o obj-$(CONFIG_EP93XX) += ep93xx/ obj-$(CONFIG_IMX) += imx/ diff --git a/arch/arm/cpu/arm920t/s3c24x0/Makefile b/arch/arm/cpu/arm920t/s3c24x0/Makefile index e44c549..e78f8a0 100644 --- a/arch/arm/cpu/arm920t/s3c24x0/Makefile +++ b/arch/arm/cpu/arm920t/s3c24x0/Makefile @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_USE_IRQ) += interrupts.o obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o obj-y += speed.o obj-y += timer.o diff --git a/arch/arm/cpu/armv7m/Makefile b/arch/arm/cpu/armv7m/Makefile index e1a6c40..93c9085 100644 --- a/arch/arm/cpu/armv7m/Makefile +++ b/arch/arm/cpu/armv7m/Makefile @@ -6,6 +6,5 @@ # extra-y := start.o -obj-y += cpu.o - +obj-y += cpu.o cache.o obj-$(CONFIG_SYS_ARCH_TIMER) += systick-timer.o diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c new file mode 100644 index 0000000..162cfe3 --- /dev/null +++ b/arch/arm/cpu/armv7m/cache.c @@ -0,0 +1,336 @@ +/* + * (C) Copyright 2017 + * Vikas Manocha, ST Micoelectronics, vikas.manocha@st.com. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <errno.h> +#include <asm/armv7m.h> +#include <asm/io.h> + +/* Cache maintenance operation registers */ + +#define V7M_CACHE_REG_ICIALLU ((u32 *)(V7M_CACHE_MAINT_BASE + 0x00)) +#define INVAL_ICACHE_POU 0 +#define V7M_CACHE_REG_ICIMVALU ((u32 *)(V7M_CACHE_MAINT_BASE + 0x08)) +#define V7M_CACHE_REG_DCIMVAC ((u32 *)(V7M_CACHE_MAINT_BASE + 0x0C)) +#define V7M_CACHE_REG_DCISW ((u32 *)(V7M_CACHE_MAINT_BASE + 0x10)) +#define V7M_CACHE_REG_DCCMVAU ((u32 *)(V7M_CACHE_MAINT_BASE + 0x14)) +#define V7M_CACHE_REG_DCCMVAC ((u32 *)(V7M_CACHE_MAINT_BASE + 0x18)) +#define V7M_CACHE_REG_DCCSW ((u32 *)(V7M_CACHE_MAINT_BASE + 0x1C)) +#define V7M_CACHE_REG_DCCIMVAC ((u32 *)(V7M_CACHE_MAINT_BASE + 0x20)) +#define V7M_CACHE_REG_DCCISW ((u32 *)(V7M_CACHE_MAINT_BASE + 0x24)) +#define WAYS_SHIFT 30 +#define SETS_SHIFT 5 + +/* armv7m processor feature registers */ + +#define V7M_PROC_REG_CLIDR ((u32 *)(V7M_PROC_FTR_BASE + 0x00)) +#define V7M_PROC_REG_CTR ((u32 *)(V7M_PROC_FTR_BASE + 0x04)) +#define V7M_PROC_REG_CCSIDR ((u32 *)(V7M_PROC_FTR_BASE + 0x08)) +#define MASK_NUM_WAYS GENMASK(12, 3) +#define MASK_NUM_SETS GENMASK(27, 13) +#define CLINE_SIZE_MASK GENMASK(2, 0) +#define NUM_WAYS_SHIFT 3 +#define NUM_SETS_SHIFT 13 +#define V7M_PROC_REG_CSSELR ((u32 *)(V7M_PROC_FTR_BASE + 0x0C)) +#define SEL_I_OR_D BIT(0) + +enum cache_type { + DCACHE, + ICACHE, +}; + +/* PoU : Point of Unification, Poc: Point of Coherency */ +enum cache_action { + INVALIDATE_POU, /* i-cache invalidate by address */ + INVALIDATE_POC, /* d-cache invalidate by address */ + INVALIDATE_SET_WAY, /* d-cache invalidate by sets/ways */ + FLUSH_POU, /* d-cache clean by address to the PoU */ + FLUSH_POC, /* d-cache clean by address to the PoC */ + FLUSH_SET_WAY, /* d-cache clean by sets/ways */ + FLUSH_INVAL_POC, /* d-cache clean & invalidate by addr to PoC */ + FLUSH_INVAL_SET_WAY, /* d-cache clean & invalidate by set/ways */ +}; + +#ifndef CONFIG_SYS_DCACHE_OFF +struct dcache_config { + u32 ways; + u32 sets; +}; + +static void get_cache_ways_sets(struct dcache_config *cache) +{ + u32 cache_size_id = readl(V7M_PROC_REG_CCSIDR); + + cache->ways = (cache_size_id & MASK_NUM_WAYS) >> NUM_WAYS_SHIFT; + cache->sets = (cache_size_id & MASK_NUM_SETS) >> NUM_SETS_SHIFT; +} + +/* + * Return the io register to perform required cache action like clean or clean + * & invalidate by sets/ways. + */ +static u32 *get_action_reg_set_ways(enum cache_action action) +{ + switch (action) { + case INVALIDATE_SET_WAY: + return V7M_CACHE_REG_DCISW; + case FLUSH_SET_WAY: + return V7M_CACHE_REG_DCCSW; + case FLUSH_INVAL_SET_WAY: + return V7M_CACHE_REG_DCCISW; + default: + break; + }; + + return NULL; +} + +/* + * Return the io register to perform required cache action like clean or clean + * & invalidate by adddress or range. + */ +static u32 *get_action_reg_range(enum cache_action action) +{ + switch (action) { + case INVALIDATE_POU: + return V7M_CACHE_REG_ICIMVALU; + case INVALIDATE_POC: + return V7M_CACHE_REG_DCIMVAC; + case FLUSH_POU: + return V7M_CACHE_REG_DCCMVAU; + case FLUSH_POC: + return V7M_CACHE_REG_DCCMVAC; + case FLUSH_INVAL_POC: + return V7M_CACHE_REG_DCCIMVAC; + default: + break; + } + + return NULL; +} + +static u32 get_cline_size(enum cache_type type) +{ + u32 size; + + if (type == DCACHE) + clrbits_le32(V7M_PROC_REG_CSSELR, BIT(SEL_I_OR_D)); + else if (type == ICACHE) + setbits_le32(V7M_PROC_REG_CSSELR, BIT(SEL_I_OR_D)); + /* Make sure cache selection is effective for next memory access */ + dsb(); + + size = readl(V7M_PROC_REG_CCSIDR) & CLINE_SIZE_MASK; + /* Size enocoded as 2 less than log(no_of_words_in_cache_line) base 2 */ + size = 1 << (size + 2); + debug("cache line size is %d\n", size); + + return size; +} + +/* Perform the action like invalidate/clean on a range of cache addresses */ +static int action_cache_range(enum cache_action action, u32 start_addr, + int64_t size) +{ + u32 cline_size; + u32 *action_reg; + enum cache_type type; + + action_reg = get_action_reg_range(action); + if (!action_reg) + return -EINVAL; + if (action == INVALIDATE_POU) + type = ICACHE; + else + type = DCACHE; + + /* Cache line size is minium size for the cache action */ + cline_size = get_cline_size(type); + /* Align start address to cache line boundary */ + start_addr &= ~(cline_size - 1); + debug("total size for cache action = %llx\n", size); + do { + writel(start_addr, action_reg); + size -= cline_size; + start_addr += cline_size; + } while (size > cline_size); + + /* Make sure cache action is effective for next memory access */ + dsb(); + isb(); /* Make sure instruction stream sees it */ + debug("cache action on range done\n"); + + return 0; +} + +/* Perform the action like invalidate/clean on all cached addresses */ +static int action_dcache_all(enum cache_action action) +{ + struct dcache_config cache; + u32 *action_reg; + int i, j; + + action_reg = get_action_reg_set_ways(action); + if (!action_reg) + return -EINVAL; + + clrbits_le32(V7M_PROC_REG_CSSELR, BIT(SEL_I_OR_D)); + /* Make sure cache selection is effective for next memory access */ + dsb(); + + get_cache_ways_sets(&cache); /* Get number of ways & sets */ + debug("cache: ways= %d, sets= %d\n", cache.ways + 1, cache.sets + 1); + for (i = cache.sets; i >= 0; i--) { + for (j = cache.ways; j >= 0; j--) { + writel((j << WAYS_SHIFT) | (i << SETS_SHIFT), + action_reg); + } + } + + /* Make sure cache action is effective for next memory access */ + dsb(); + isb(); /* Make sure instruction stream sees it */ + + return 0; +} + +void dcache_enable(void) +{ + if (dcache_status()) /* return if cache already enabled */ + return; + + if (action_dcache_all(INVALIDATE_SET_WAY)) { + printf("ERR: D-cache not enabled\n"); + return; + } + + setbits_le32(&V7M_SCB->ccr, BIT(V7M_CCR_DCACHE)); + + /* Make sure cache action is effective for next memory access */ + dsb(); + isb(); /* Make sure instruction stream sees it */ +} + +void dcache_disable(void) +{ + if (!dcache_status()) + return; + + /* if dcache is enabled-> dcache disable & then flush */ + if (action_dcache_all(FLUSH_SET_WAY)) { + printf("ERR: D-cache not flushed\n"); + return; + } + + clrbits_le32(&V7M_SCB->ccr, BIT(V7M_CCR_DCACHE)); + + /* Make sure cache action is effective for next memory access */ + dsb(); + isb(); /* Make sure instruction stream sees it */ +} + +int dcache_status(void) +{ + return (readl(&V7M_SCB->ccr) & BIT(V7M_CCR_DCACHE)) != 0; +} + +void invalidate_dcache_range(unsigned long start, unsigned long stop) +{ + if (action_cache_range(INVALIDATE_POC, start, stop - start)) { + printf("ERR: D-cache not invalidated\n"); + return; + } +} + +void flush_dcache_range(unsigned long start, unsigned long stop) +{ + if (action_cache_range(FLUSH_POC, start, stop - start)) { + printf("ERR: D-cache not flushed\n"); + return; + } +} +#else +void dcache_enable(void) +{ + return; +} + +void dcache_disable(void) +{ + return; +} + +int dcache_status(void) +{ + return 0; +} +#endif + +#ifndef CONFIG_SYS_ICACHE_OFF + +void invalidate_icache_all(void) +{ + writel(INVAL_ICACHE_POU, V7M_CACHE_REG_ICIALLU); + + /* Make sure cache action is effective for next memory access */ + dsb(); + isb(); /* Make sure instruction stream sees it */ +} + +void icache_enable(void) +{ + if (icache_status()) + return; + + invalidate_icache_all(); + setbits_le32(&V7M_SCB->ccr, BIT(V7M_CCR_ICACHE)); + + /* Make sure cache action is effective for next memory access */ + dsb(); + isb(); /* Make sure instruction stream sees it */ +} + +int icache_status(void) +{ + return (readl(&V7M_SCB->ccr) & BIT(V7M_CCR_ICACHE)) != 0; +} + +void icache_disable(void) +{ + if (!icache_status()) + return; + + isb(); /* flush pipeline */ + clrbits_le32(&V7M_SCB->ccr, BIT(V7M_CCR_ICACHE)); + isb(); /* subsequent instructions fetch see cache disable effect */ +} +#else +void icache_enable(void) +{ + return; +} + +void icache_disable(void) +{ + return; +} + +int icache_status(void) +{ + return 0; +} +#endif + +void enable_caches(void) +{ +#ifndef CONFIG_SYS_ICACHE_OFF + icache_enable(); +#endif +#ifndef CONFIG_SYS_DCACHE_OFF + dcache_enable(); +#endif +} diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index 499e1dd..5ac48eb 100644 --- a/arch/arm/cpu/armv8/zynqmp/Kconfig +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig @@ -13,7 +13,7 @@ config SPL_LIBGENERIC_SUPPORT default y config SPL_MMC_SUPPORT - default y + default y if MMC_SDHCI_ZYNQ config SPL_SERIAL_SUPPORT default y diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index 4c9752a..59585af 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -19,10 +19,6 @@ #include <asm/system.h> #include <asm/io.h> -#ifdef CONFIG_USE_IRQ -DECLARE_GLOBAL_DATA_PTR; -#endif - static void cache_flush(void); int cleanup_before_linux (void) diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h index 54d8a2b..ebf0f17 100644 --- a/arch/arm/include/asm/armv7m.h +++ b/arch/arm/include/asm/armv7m.h @@ -16,8 +16,15 @@ .thumb #endif -#define V7M_SCB_BASE 0xE000ED00 -#define V7M_MPU_BASE 0xE000ED90 +/* armv7m fixed base addresses */ +#define V7M_SCS_BASE 0xE000E000 +#define V7M_NVIC_BASE (V7M_SCS_BASE + 0x0100) +#define V7M_SCB_BASE (V7M_SCS_BASE + 0x0D00) +#define V7M_PROC_FTR_BASE (V7M_SCS_BASE + 0x0D78) +#define V7M_MPU_BASE (V7M_SCS_BASE + 0x0D90) +#define V7M_FPU_BASE (V7M_SCS_BASE + 0x0F30) +#define V7M_CACHE_MAINT_BASE (V7M_SCS_BASE + 0x0F50) +#define V7M_ACCESS_CNTL_BASE (V7M_SCS_BASE + 0x0F90) #define V7M_SCB_VTOR 0x08 @@ -27,6 +34,18 @@ struct v7m_scb { uint32_t icsr; /* Interrupt Control and State Register */ uint32_t vtor; /* Vector Table Offset Register */ uint32_t aircr; /* App Interrupt and Reset Control Register */ + uint32_t scr; /* offset 0x10: System Control Register */ + uint32_t ccr; /* offset 0x14: Config and Control Register */ + uint32_t shpr1; /* offset 0x18: System Handler Priority Reg 1 */ + uint32_t shpr2; /* offset 0x1c: System Handler Priority Reg 2 */ + uint32_t shpr3; /* offset 0x20: System Handler Priority Reg 3 */ + uint32_t shcrs; /* offset 0x24: System Handler Control State */ + uint32_t cfsr; /* offset 0x28: Configurable Fault Status Reg */ + uint32_t hfsr; /* offset 0x2C: HardFault Status Register */ + uint32_t res; /* offset 0x30: reserved */ + uint32_t mmar; /* offset 0x34: MemManage Fault Address Reg */ + uint32_t bfar; /* offset 0x38: BusFault Address Reg */ + uint32_t afsr; /* offset 0x3C: Auxiliary Fault Status Reg */ }; #define V7M_SCB ((struct v7m_scb *)V7M_SCB_BASE) @@ -39,6 +58,9 @@ struct v7m_scb { #define V7M_ICSR_VECTACT_MSK 0xFF +#define V7M_CCR_DCACHE 16 +#define V7M_CCR_ICACHE 17 + struct v7m_mpu { uint32_t type; /* Type Register */ uint32_t ctrl; /* Control Register */ diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index b95e105..6e96cfb 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -55,8 +55,10 @@ endif obj-y += cache.o ifndef CONFIG_ARM64 +ifndef CONFIG_CPU_V7M obj-y += cache-cp15.o endif +endif obj-y += psci-dt.o diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index ed83043..066c172 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -26,75 +26,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_USE_IRQ -int interrupt_init (void) -{ - unsigned long cpsr; - - /* - * setup up stacks if necessary - */ - IRQ_STACK_START = gd->irq_sp - 4; - IRQ_STACK_START_IN = gd->irq_sp + 8; - FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; - - - __asm__ __volatile__("mrs %0, cpsr\n" - : "=r" (cpsr) - : - : "memory"); - - __asm__ __volatile__("msr cpsr_c, %0\n" - "mov sp, %1\n" - : - : "r" (IRQ_MODE | I_BIT | F_BIT | (cpsr & ~FIQ_MODE)), - "r" (IRQ_STACK_START) - : "memory"); - - __asm__ __volatile__("msr cpsr_c, %0\n" - "mov sp, %1\n" - : - : "r" (FIQ_MODE | I_BIT | F_BIT | (cpsr & ~IRQ_MODE)), - "r" (FIQ_STACK_START) - : "memory"); - - __asm__ __volatile__("msr cpsr_c, %0" - : - : "r" (cpsr) - : "memory"); - - return arch_interrupt_init(); -} - -/* enable IRQ interrupts */ -void enable_interrupts (void) -{ - unsigned long temp; - __asm__ __volatile__("mrs %0, cpsr\n" - "bic %0, %0, #0x80\n" - "msr cpsr_c, %0" - : "=r" (temp) - : - : "memory"); -} - - -/* - * disable IRQ/FIQ interrupts - * returns true if interrupts had been enabled before we disabled them - */ -int disable_interrupts (void) -{ - unsigned long old,temp; - __asm__ __volatile__("mrs %0, cpsr\n" - "orr %1, %0, #0xc0\n" - "msr cpsr_c, %1" - : "=r" (old), "=r" (temp) - : - : "memory"); - return (old & 0x80) == 0; -} -#else int interrupt_init (void) { /* @@ -113,8 +44,6 @@ int disable_interrupts (void) { return 0; } -#endif - void bad_mode (void) { @@ -212,7 +141,6 @@ void do_fiq (struct pt_regs *pt_regs) bad_mode (); } -#ifndef CONFIG_USE_IRQ void do_irq (struct pt_regs *pt_regs) { efi_restore_gd(); @@ -220,4 +148,3 @@ void do_irq (struct pt_regs *pt_regs) show_regs (pt_regs); bad_mode (); } -#endif diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c index 4614d26..737622d 100644 --- a/arch/arm/lib/stack.c +++ b/arch/arm/lib/stack.c @@ -25,14 +25,6 @@ int arch_reserve_stacks(void) gd->irq_sp = gd->start_addr_sp; # if !defined(CONFIG_ARM64) -# ifdef CONFIG_USE_IRQ - gd->start_addr_sp -= (CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ); - debug("Reserving %zu Bytes for IRQ stack at: %08lx\n", - CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ, gd->start_addr_sp); - - /* 8-byte alignment for ARM ABI compliance */ - gd->start_addr_sp &= ~0x07; -# endif /* leave 3 words for abort-stack, plus 1 for alignment */ gd->start_addr_sp -= 16; # endif diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 9fe7415..f53b1e9 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -128,19 +128,6 @@ fiq: IRQ_STACK_START_IN: .word 0x0badc0de -#ifdef CONFIG_USE_IRQ -/* IRQ stack memory (calculated at run-time) */ -.globl IRQ_STACK_START -IRQ_STACK_START: - .word 0x0badc0de - -/* IRQ stack memory (calculated at run-time) */ -.globl FIQ_STACK_START -FIQ_STACK_START: - .word 0x0badc0de - -#endif /* CONFIG_USE_IRQ */ - @ @ IRQ stack frame. @ @@ -264,24 +251,6 @@ not_used: bad_save_user_regs bl do_not_used -#ifdef CONFIG_USE_IRQ - - .align 5 -irq: - get_irq_stack - irq_save_user_regs - bl do_irq - irq_restore_user_regs - - .align 5 -fiq: - get_fiq_stack - /* someone ought to write a more effiction fiq_save_user_regs */ - irq_save_user_regs - bl do_fiq - irq_restore_user_regs - -#else .align 5 irq: @@ -295,6 +264,4 @@ fiq: bad_save_user_regs bl do_fiq -#endif /* CONFIG_USE_IRQ */ - #endif /* CONFIG_SPL_BUILD */ diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c index e1064e0..ec331ba 100644 --- a/arch/arm/mach-davinci/misc.c +++ b/arch/arm/mach-davinci/misc.c @@ -107,7 +107,6 @@ void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr) #endif /* CONFIG_DRIVER_TI_EMAC */ #if defined(CONFIG_SOC_DA8XX) -#ifndef CONFIG_USE_IRQ void irq_init(void) { /* @@ -122,7 +121,6 @@ void irq_init(void) writel(0xffffffff, &davinci_aintc_regs->ecr2); writel(0xffffffff, &davinci_aintc_regs->ecr3); } -#endif /* * Enable PSC for various peripherals. diff --git a/arch/arm/mach-keystone/cmd_ddr3.c b/arch/arm/mach-keystone/cmd_ddr3.c index ea78ad8..d3eab07 100644 --- a/arch/arm/mach-keystone/cmd_ddr3.c +++ b/arch/arm/mach-keystone/cmd_ddr3.c @@ -15,12 +15,13 @@ DECLARE_GLOBAL_DATA_PTR; #define DDR_MIN_ADDR CONFIG_SYS_SDRAM_BASE +#define STACKSIZE (512 << 10) /* 512 KiB */ #define DDR_REMAP_ADDR 0x80000000 #define ECC_START_ADDR1 ((DDR_MIN_ADDR - DDR_REMAP_ADDR) >> 17) #define ECC_END_ADDR1 (((gd->start_addr_sp - DDR_REMAP_ADDR - \ - CONFIG_STACKSIZE) >> 17) - 2) + STACKSIZE) >> 17) - 2) #define DDR_TEST_BURST_SIZE 1024 diff --git a/arch/arm/mach-stm32/stm32f7/soc.c b/arch/arm/mach-stm32/stm32f7/soc.c index 06af631..6f9704a 100644 --- a/arch/arm/mach-stm32/stm32f7/soc.c +++ b/arch/arm/mach-stm32/stm32f7/soc.c @@ -58,6 +58,8 @@ int arch_cpu_init(void) (V7M_MPU_RASR_XN_ENABLE | V7M_MPU_RASR_AP_RW_RW | 0x01 << V7M_MPU_RASR_TEX_SHIFT + | 0x01 << V7M_MPU_RASR_B_SHIFT + | 0x01 << V7M_MPU_RASR_C_SHIFT | V7M_MPU_RASR_SIZE_8MB | V7M_MPU_RASR_EN) , &V7M_MPU->rasr diff --git a/arch/avr32/cpu/exception.c b/arch/avr32/cpu/exception.c index d6991f6..22eab03 100644 --- a/arch/avr32/cpu/exception.c +++ b/arch/avr32/cpu/exception.c @@ -10,6 +10,8 @@ DECLARE_GLOBAL_DATA_PTR; +#define STACKSIZE 2048 + static const char * const cpu_modes[8] = { "Application", "Supervisor", "Interrupt level 0", "Interrupt level 1", "Interrupt level 2", "Interrupt level 3", "Exception", "NMI" @@ -96,7 +98,7 @@ void do_unknown_exception(unsigned int ecr, struct pt_regs *regs) printf("CPU Mode: %s\n", cpu_modes[mode]); /* Avoid exception loops */ - if (regs->sp < (gd->start_addr_sp - CONFIG_STACKSIZE) || + if (regs->sp < (gd->start_addr_sp - STACKSIZE) || regs->sp >= gd->start_addr_sp) printf("\nStack pointer seems bogus, won't do stack dump\n"); else diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S index 7b2b637..99971fd 100644 --- a/arch/nds32/cpu/n1213/start.S +++ b/arch/nds32/cpu/n1213/start.S @@ -90,24 +90,6 @@ _start: j reset _TEXT_BASE: .word CONFIG_SYS_TEXT_BASE -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -#ifdef CONFIG_USE_IRQ -/* IRQ stack memory (calculated at run-time) */ -.globl IRQ_STACK_START -IRQ_STACK_START: - .word 0x0badc0de - -/* IRQ stack memory (calculated at run-time) */ -.globl FIQ_STACK_START -FIQ_STACK_START: - .word 0x0badc0de -#endif - /* IRQ stack memory (calculated at run-time) + 8 bytes */ .globl IRQ_STACK_START_IN IRQ_STACK_START_IN: diff --git a/board/Barix/ipam390/ipam390.c b/board/Barix/ipam390/ipam390.c index 9747f32..fd1965d 100644 --- a/board/Barix/ipam390/ipam390.c +++ b/board/Barix/ipam390/ipam390.c @@ -188,9 +188,7 @@ int board_early_init_f(void) int board_init(void) { -#ifndef CONFIG_USE_IRQ irq_init(); -#endif /* arch number of the board */ gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_DA850_EVM; diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 37d2f54..9e17eb8 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -323,9 +323,7 @@ int board_early_init_f(void) int board_init(void) { -#ifndef CONFIG_USE_IRQ irq_init(); -#endif #ifdef CONFIG_NAND_DAVINCI /* diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 3ce1992..d941285 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -171,9 +171,7 @@ int board_early_init_f(void) int board_init(void) { -#ifndef CONFIG_USE_IRQ irq_init(); -#endif /* arch number of the board */ gd->bd->bi_arch_number = MACH_TYPE_OMAPL138_LCDK; diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c index 66804d7..6edfa17 100644 --- a/board/davinci/ea20/ea20.c +++ b/board/davinci/ea20/ea20.c @@ -203,9 +203,7 @@ int board_early_init_f(void) /* Set LCD_B_PWR low to power down LCD Backlight*/ gpio_direction_output(102, 0); -#ifndef CONFIG_USE_IRQ irq_init(); -#endif /* * NAND CS setup - cycle counts based on da850evm NAND timings in the diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c index 7e1766c..0ad33ea 100644 --- a/board/lego/ev3/legoev3.c +++ b/board/lego/ev3/legoev3.c @@ -145,9 +145,7 @@ int board_early_init_f(void) int board_init(void) { -#ifndef CONFIG_USE_IRQ irq_init(); -#endif /* arch number of the board */ /* LEGO didn't register for a unique number and uses da850evm */ diff --git a/board/omicron/calimain/calimain.c b/board/omicron/calimain/calimain.c index 32f2b20..80a142e 100644 --- a/board/omicron/calimain/calimain.c +++ b/board/omicron/calimain/calimain.c @@ -100,9 +100,7 @@ int board_init(void) { int val; -#ifndef CONFIG_USE_IRQ irq_init(); -#endif /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c index 1e7d421..92b0695 100644 --- a/board/st/stih410-b2260/board.c +++ b/board/st/stih410-b2260/board.c @@ -24,6 +24,14 @@ int dram_init_banksize(void) return 0; } +#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{ + /* Enable D-cache. I-cache is already enabled in start.S */ + dcache_enable(); +} +#endif + int board_init(void) { return 0; diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 3e0e262..a667c9e 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -3,6 +3,7 @@ if ARCH_SUNXI config IDENT_STRING default " Allwinner Technology" +# FIXME: Should not redefine these Kconfig symbols config PRE_CONSOLE_BUFFER default y @@ -19,6 +20,7 @@ config SPL_LIBGENERIC_SUPPORT default y config SPL_MMC_SUPPORT + depends on SPL && GENERIC_MMC default y config SPL_POWER_SUPPORT diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 8eaf3e9..3e842d3 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -651,6 +651,21 @@ int board_late_init(void) #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG char *name = NULL; + if (board_is_bone_lt()) { + /* BeagleBoard.org BeagleBone Black Wireless: */ + if (!strncmp(board_ti_get_rev(), "BWA", 3)) { + name = "BBBW"; + } + /* SeeedStudio BeagleBone Green Wireless */ + if (!strncmp(board_ti_get_rev(), "GW1", 3)) { + name = "BBGW"; + } + /* BeagleBoard.org BeagleBone Blue */ + if (!strncmp(board_ti_get_rev(), "BLA", 3)) { + name = "BBBL"; + } + } + if (board_is_bbg1()) name = "BBG1"; set_board_info_env(name); diff --git a/board/ti/am57xx/mux_data.h b/board/ti/am57xx/mux_data.h index 5485212..aff274c 100644 --- a/board/ti/am57xx/mux_data.h +++ b/board/ti/am57xx/mux_data.h @@ -212,7 +212,7 @@ const struct pad_conf_entry core_padconf_array_essential_x15[] = { {MCASP5_FSX, (M3 | PIN_OUTPUT_PULLDOWN)}, /* mcasp5_fsx.uart9_txd */ {MCASP5_AXR0, (M3 | PIN_INPUT_PULLDOWN)}, /* mcasp5_axr0.uart9_ctsn */ {MCASP5_AXR1, (M3 | PIN_OUTPUT_PULLUP)}, /* mcasp5_axr1.uart9_rtsn */ - {MMC1_CLK, (M0 | PIN_OUTPUT_PULLUP)}, /* mmc1_clk.mmc1_clk */ + {MMC1_CLK, (M0 | PIN_INPUT_PULLUP)}, /* mmc1_clk.mmc1_clk */ {MMC1_CMD, (M0 | PIN_INPUT_PULLUP)}, /* mmc1_cmd.mmc1_cmd */ {MMC1_DAT0, (M0 | PIN_INPUT_PULLUP)}, /* mmc1_dat0.mmc1_dat0 */ {MMC1_DAT1, (M0 | PIN_INPUT_PULLUP)}, /* mmc1_dat1.mmc1_dat1 */ @@ -221,7 +221,7 @@ const struct pad_conf_entry core_padconf_array_essential_x15[] = { {MMC1_SDCD, (M14 | PIN_INPUT_PULLUP)}, /* mmc1_sdcd.gpio6_27 */ {GPIO6_10, (M10 | PIN_OUTPUT_PULLDOWN)}, /* gpio6_10.ehrpwm2A */ {GPIO6_11, (M0 | PIN_INPUT_PULLUP)}, /* gpio6_11.gpio6_11 */ - {MMC3_CLK, (M0 | PIN_OUTPUT_PULLUP | MANUAL_MODE)}, /* mmc3_clk.mmc3_clk */ + {MMC3_CLK, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_clk.mmc3_clk */ {MMC3_CMD, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_cmd.mmc3_cmd */ {MMC3_DAT0, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat0.mmc3_dat0 */ {MMC3_DAT1, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat1.mmc3_dat1 */ diff --git a/common/Kconfig b/common/Kconfig index 04a73e0..1879aef 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -90,7 +90,7 @@ config BOOTSTAGE_STASH_ADDR config BOOTSTAGE_STASH_SIZE hex "Size of boot timing stash region" - default 4096 + default 0x1000 help This should be large enough to hold the bootstage stash. A value of 4096 (4KiB) is normally plenty. diff --git a/common/board_f.c b/common/board_f.c index 224fbed..ff07886 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -137,11 +137,6 @@ static int display_text_info(void) text_base, bss_start, bss_end); #endif -#ifdef CONFIG_USE_IRQ - debug("IRQ Stack: %08lx\n", IRQ_STACK_START); - debug("FIQ Stack: %08lx\n", FIQ_STACK_START); -#endif - return 0; } diff --git a/common/env_mmc.c b/common/env_mmc.c index 16f6a17..a5d14d4 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -82,10 +82,6 @@ static int mmc_set_env_part(struct mmc *mmc) int dev = mmc_get_env_dev(); int ret = 0; -#ifdef CONFIG_SPL_BUILD - dev = 0; -#endif - env_mmc_orig_hwpart = mmc_get_blk_desc(mmc)->hwpart; ret = blk_select_hwpart_devnum(IF_TYPE_MMC, dev, part); if (ret) @@ -116,9 +112,6 @@ static void fini_mmc_for_env(struct mmc *mmc) #ifdef CONFIG_SYS_MMC_ENV_PART int dev = mmc_get_env_dev(); -#ifdef CONFIG_SPL_BUILD - dev = 0; -#endif blk_select_hwpart_devnum(IF_TYPE_MMC, dev, env_mmc_orig_hwpart); #endif } @@ -223,10 +216,6 @@ void env_relocate_spec(void) ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1); ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1); -#ifdef CONFIG_SPL_BUILD - dev = 0; -#endif - mmc = find_mmc_device(dev); errmsg = init_mmc_for_env(mmc); @@ -306,10 +295,6 @@ void env_relocate_spec(void) int dev = mmc_get_env_dev(); const char *errmsg; -#ifdef CONFIG_SPL_BUILD - dev = 0; -#endif - mmc = find_mmc_device(dev); errmsg = init_mmc_for_env(mmc); diff --git a/common/image-fdt.c b/common/image-fdt.c index e7540be..7468b90 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -494,7 +494,6 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, goto err; } } - fdt_fixup_ethernet(blob); /* Delete the old LMB reservation */ if (lmb) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 6752b5c..ea6fbb6 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -371,7 +371,7 @@ config SPL_LIBGENERIC_SUPPORT config SPL_MMC_SUPPORT bool "Support MMC" - depends on SPL + depends on SPL && GENERIC_MMC help Enable support for MMC (Multimedia Card) within SPL. This enables the MMC protocol implementation and allows any enabled drivers to diff --git a/common/spl/spl.c b/common/spl/spl.c index 0d1e082..a3e73b8 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -85,6 +85,9 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) { spl_image->size = CONFIG_SYS_MONITOR_LEN; spl_image->entry_point = CONFIG_SYS_UBOOT_START; +#ifdef CONFIG_CPU_V7M + spl_image->entry_point |= 0x1; +#endif spl_image->load_addr = CONFIG_SYS_TEXT_BASE; spl_image->os = IH_OS_U_BOOT; spl_image->name = "U-Boot"; diff --git a/common/xyzModem.c b/common/xyzModem.c index e0d87db..a0c5dfe 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -39,25 +39,17 @@ #define CAN 0x18 #define EOF 0x1A /* ^Z for DOS officionados */ -#define USE_YMODEM_LENGTH - /* Data & state local to the protocol */ static struct { -#ifdef REDBOOT - hal_virtual_comm_table_t *__chan; -#else int *__chan; -#endif unsigned char pkt[1024], *bufp; unsigned char blk, cblk, crc1, crc2; unsigned char next_blk; /* Expected block */ int len, mode, total_retries; int total_SOH, total_STX, total_CAN; bool crc_mode, at_eof, tx_ack; -#ifdef USE_YMODEM_LENGTH unsigned long file_length, read_length; -#endif } xyz; #define xyzModem_CHAR_TIMEOUT 2000 /* 2 seconds */ @@ -66,7 +58,6 @@ static struct #define xyzModem_CAN_COUNT 3 /* Wait for 3 CAN before quitting */ -#ifndef REDBOOT /*SB */ typedef int cyg_int32; static int CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c) @@ -156,17 +147,7 @@ parse_num (char *s, unsigned long *val, char **es, char *delim) if (_is_hex (c) && ((digit = _from_hex (c)) < radix)) { /* Valid digit */ -#ifdef CYGPKG_HAL_MIPS - /* FIXME: tx49 compiler generates 0x2539018 for MUL which */ - /* isn't any good. */ - if (16 == radix) - result = result << 4; - else - result = 10 * result; - result += digit; -#else result = (result * radix) + digit; -#endif } else { @@ -190,54 +171,15 @@ parse_num (char *s, unsigned long *val, char **es, char *delim) return true; } -#endif -#define USE_SPRINTF #ifdef DEBUG -#ifndef USE_SPRINTF -/* - * Note: this debug setup only works if the target platform has two serial ports - * available so that the other one (currently only port 1) can be used for debug - * messages. - */ -static int -zm_dprintf (char *fmt, ...) -{ - int cur_console; - va_list args; - - va_start (args, fmt); -#ifdef REDBOOT - cur_console = - CYGACC_CALL_IF_SET_CONSOLE_COMM - (CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT); - CYGACC_CALL_IF_SET_CONSOLE_COMM (1); -#endif - diag_vprintf (fmt, args); -#ifdef REDBOOT - CYGACC_CALL_IF_SET_CONSOLE_COMM (cur_console); -#endif -} - -static void -zm_flush (void) -{ -} - -#else /* * Note: this debug setup works by storing the strings in a fixed buffer */ -#define FINAL -#ifdef FINAL -static char *zm_out = (char *) 0x00380000; -static char *zm_out_start = (char *) 0x00380000; -#else -static char zm_buf[8192]; -static char *zm_out = zm_buf; -static char *zm_out_start = zm_buf; +static char zm_debug_buf[8192]; +static char *zm_out = zm_debug_buf; +static char *zm_out_start = zm_debug_buf; -#endif static int zm_dprintf (char *fmt, ...) { @@ -253,23 +195,13 @@ zm_dprintf (char *fmt, ...) static void zm_flush (void) { -#ifdef REDBOOT - char *p = zm_out_start; - while (*p) - mon_write_char (*p++); -#endif zm_out = zm_out_start; } -#endif static void zm_dump_buf (void *buf, int len) { -#ifdef REDBOOT - diag_vdump_buf_with_offset (zm_dprintf, buf, len, 0); -#else -#endif } static unsigned char zm_buf[2048]; @@ -476,9 +408,6 @@ xyzModem_get_hdr (void) int xyzModem_stream_open (connection_info_t * info, int *err) { -#ifdef REDBOOT - int console_chan; -#endif int stat = 0; int retries = xyzModem_MAX_RETRIES; int crc_retries = xyzModem_MAX_RETRIES_WITH_CRC; @@ -492,29 +421,9 @@ xyzModem_stream_open (connection_info_t * info, int *err) } #endif -#ifdef REDBOOT - /* Set up the I/O channel. Note: this allows for using a different port in the future */ - console_chan = - CYGACC_CALL_IF_SET_CONSOLE_COMM - (CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT); - if (info->chan >= 0) - { - CYGACC_CALL_IF_SET_CONSOLE_COMM (info->chan); - } - else - { - CYGACC_CALL_IF_SET_CONSOLE_COMM (console_chan); - } - xyz.__chan = CYGACC_CALL_IF_CONSOLE_PROCS (); - - CYGACC_CALL_IF_SET_CONSOLE_COMM (console_chan); - CYGACC_COMM_IF_CONTROL (*xyz.__chan, __COMMCTL_SET_TIMEOUT, - xyzModem_CHAR_TIMEOUT); -#else /* TODO: CHECK ! */ int dummy = 0; xyz.__chan = &dummy; -#endif xyz.len = 0; xyz.crc_mode = true; xyz.at_eof = false; @@ -524,10 +433,8 @@ xyzModem_stream_open (connection_info_t * info, int *err) xyz.total_SOH = 0; xyz.total_STX = 0; xyz.total_CAN = 0; -#ifdef USE_YMODEM_LENGTH xyz.read_length = 0; xyz.file_length = 0; -#endif CYGACC_COMM_IF_PUTC (*xyz.__chan, (xyz.crc_mode ? 'C' : NAK)); @@ -546,12 +453,10 @@ xyzModem_stream_open (connection_info_t * info, int *err) /* Y-modem file information header */ if (xyz.blk == 0) { -#ifdef USE_YMODEM_LENGTH /* skip filename */ while (*xyz.bufp++); /* get the length */ parse_num ((char *) xyz.bufp, &xyz.file_length, NULL, " "); -#endif /* The rest of the file name data block quietly discarded */ xyz.tx_ack = true; } @@ -604,13 +509,8 @@ xyzModem_stream_read (char *buf, int size, int *err) ("ACK block %d (%d)\n", xyz.blk, __LINE__)); xyz.next_blk = (xyz.next_blk + 1) & 0xFF; -#if defined(xyzModem_zmodem) || defined(USE_YMODEM_LENGTH) if (xyz.mode == xyzModem_xmodem || xyz.file_length == 0) { -#else - if (1) - { -#endif /* Data blocks can be padded with ^Z (EOF) characters */ /* This code tries to detect and remove them */ if ((xyz.bufp[xyz.len - 1] == EOF) && @@ -625,7 +525,6 @@ xyzModem_stream_read (char *buf, int size, int *err) } } -#ifdef USE_YMODEM_LENGTH /* * See if accumulated length exceeds that of the file. * If so, reduce size (i.e., cut out pad bytes) @@ -640,7 +539,6 @@ xyzModem_stream_read (char *buf, int size, int *err) xyz.len -= (xyz.read_length - xyz.file_length); } } -#endif break; } else if (xyz.blk == ((xyz.next_blk - 1) & 0xFF)) @@ -809,10 +707,3 @@ xyzModem_error (int err) /* * RedBoot interface */ -#if 0 /* SB */ -GETC_IO_FUNCS (xyzModem_io, xyzModem_stream_open, xyzModem_stream_close, - xyzModem_stream_terminate, xyzModem_stream_read, - xyzModem_error); -RedBoot_load (xmodem, xyzModem_io, false, false, xyzModem_xmodem); -RedBoot_load (ymodem, xyzModem_io, false, false, xyzModem_ymodem); -#endif diff --git a/configs/alt_defconfig b/configs/alt_defconfig index afbfb0d..b8e2864 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_ALT=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 70da41d..5664421 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_BLANCHE=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 4878203..761d758 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_GOSE=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 6df0e25..e6b1684 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_KOELSCH=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 040efc0..a123b37 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_LAGER=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 0f7f97f..206ba47 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_PORTER=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index aa946d0..b150029 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -3,9 +3,6 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/silk_defconfig b/configs/silk_defconfig index eeba819..293b08e 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SILK=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 9646ec7..aaa8502 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -2,9 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_STOUT=y -CONFIG_BOOTSTAGE_USER_COUNT=0x20 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 2fe323a..588a84d 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -489,10 +489,6 @@ static void enc_poll(enc_dev_t *enc) u8 eir_reg; u8 pkt_cnt; -#ifdef CONFIG_USE_IRQ - /* clear global interrupt enable bit in enc28j60 */ - enc_bclr(enc, CTL_REG_EIE, ENC_EIE_INTIE); -#endif (void)enc_r8(enc, CTL_REG_ESTAT); eir_reg = enc_r8(enc, CTL_REG_EIR); if (eir_reg & ENC_EIR_TXIF) { @@ -520,10 +516,6 @@ static void enc_poll(enc_dev_t *enc) printf("%s: tx error\n", enc->dev->name); enc_bclr(enc, CTL_REG_EIR, ENC_EIR_TXERIF); } -#ifdef CONFIG_USE_IRQ - /* set global interrupt enable bit in enc28j60 */ - enc_bset(enc, CTL_REG_EIE, ENC_EIE_INTIE); -#endif } /* @@ -693,15 +685,6 @@ static int enc_setup(enc_dev_t *enc) /* Reset PDPXMD-bit => half duplex */ enc_phy_write(enc, PHY_REG_PHCON1, 0); -#ifdef CONFIG_USE_IRQ - /* enable interrupts */ - enc_bset(enc, CTL_REG_EIE, ENC_EIE_PKTIE); - enc_bset(enc, CTL_REG_EIE, ENC_EIE_TXIE); - enc_bset(enc, CTL_REG_EIE, ENC_EIE_RXERIE); - enc_bset(enc, CTL_REG_EIE, ENC_EIE_TXERIE); - enc_bset(enc, CTL_REG_EIE, ENC_EIE_INTIE); -#endif - return 0; } diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 14e9c06..4886500 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -230,7 +230,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE (128 * 1024) /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2712687..5fbc1e3 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -138,8 +138,14 @@ "setenv fdtfile am335x-bone.dtb; fi; " \ "if test $board_name = A335BNLT; then " \ "setenv fdtfile am335x-boneblack.dtb; fi; " \ + "if test $board_name = BBBW; then " \ + "setenv fdtfile am335x-boneblack-wireless.dtb; fi; " \ "if test $board_name = BBG1; then " \ "setenv fdtfile am335x-bonegreen.dtb; fi; " \ + "if test $board_name = BBGW; then " \ + "setenv fdtfile am335x-bonegreen-wireless.dtb; fi; " \ + "if test $board_name = BBBL; then " \ + "setenv fdtfile am335x-boneblue.dtb; fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h index 2b61405..7ee8ea7 100644 --- a/include/configs/am335x_igep0033.h +++ b/include/configs/am335x_igep0033.h @@ -117,9 +117,6 @@ "1m(uboot),256k(environment),"\ "-(filesystem)" -/* Unsupported features */ -#undef CONFIG_USE_IRQ - /* SPL */ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/am33xx/u-boot-spl.lds" diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 030f01c..5c27055 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -148,8 +148,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000) #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_STACKSIZE (128 * 1024) - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 708f032..4c27225 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -52,8 +52,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_STACKSIZE (2048) - #define CONFIG_BOOTARGS \ "console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index aa30848..64d7c45 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -71,8 +71,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_STACKSIZE (2048) - #define CONFIG_BOOTARGS \ "root=mtd:main rootfstype=jffs2" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 771a35a..3c03ed3 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -69,8 +69,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_STACKSIZE (2048) - #define CONFIG_BOOTARGS \ "console=ttyS0 root=/dev/mmcblk0p1 fbmem=600k rootwait=1" diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 65e9e32..77d6e6a 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -25,7 +25,6 @@ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN SZ_4M /* see armv7/start.S. */ -#define CONFIG_STACKSIZE SZ_256K /* GPIO Driver */ #define CONFIG_KONA_GPIO diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 2d9b0a8..03f4ca0 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -24,7 +24,6 @@ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN SZ_4M /* see armv7/start.S. */ -#define CONFIG_STACKSIZE SZ_256K /* GPIO Driver */ #define CONFIG_KONA_GPIO diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 868b0a8..c187df2 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -28,7 +28,6 @@ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) -#define CONFIG_STACKSIZE (256 * 1024) /* Some commands use this as the default load address */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 45511be..14b25d4 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -237,7 +237,6 @@ #define CONFIG_SERIAL_TAG /* misc */ -#define CONFIG_STACKSIZE (128 * 1024) #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_MISC_INIT_R diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 2c9c014..87d2012 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -136,8 +136,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 888899e..73b43bd 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -150,12 +150,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical memory map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (0x80000000) diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 99f0dae..f012af5 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -74,7 +74,6 @@ #define CONFIG_EP93XX 1 /* This is a Cirrus Logic 93xx SoC */ #define CONFIG_SYS_CLK_FREQ 14745600 /* EP93xx has a 14.7456 clock */ -#undef CONFIG_USE_IRQ /* Don't need IRQ/FIQ */ /* Monitor configuration */ #undef CONFIG_CMD_DATE @@ -161,12 +160,6 @@ /* Run-time memory allocatons */ #define CONFIG_SYS_GBL_DATA_SIZE 128 -#define CONFIG_STACKSIZE (128 * 1024) - -#if defined(CONFIG_USE_IRQ) -#define CONFIG_STACKSIZE_IRQ (4 * 1024) -#define CONFIG_STACKSIZE_FIQ (4 * 1024) -#endif #define CONFIG_SYS_MALLOC_LEN (512 * 1024) diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index afb5b73..0848397 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -99,8 +99,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10800000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_STACKSIZE (128 * 1024) - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 48c9e0b..658f4d9 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -76,8 +76,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_STACKSIZE (128 * 1024) - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index f86e20c..43b1fb0 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -260,7 +260,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE (128 * 1024) /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index d7b9c18..abc4214 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -69,9 +69,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_STACKSIZE (2048) - - /* * After booting the board for the first time, new ethernet addresses * should be generated and assigned to the environment variables diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 777f225..3a7993e 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_K2E_EVM_H #define __CONFIG_K2E_EVM_H +#include <environment/ti/spi.h> + /* Platform type */ #define CONFIG_SOC_K2E @@ -30,6 +32,9 @@ /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c100000 + +#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS + /* NAND Configuration */ #define CONFIG_SYS_NAND_PAGE_2K diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index bd25231..9e5949e 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_K2G_EVM_H #define __CONFIG_K2G_EVM_H +#include <environment/ti/spi.h> + /* Platform type */ #define CONFIG_SOC_K2G @@ -76,4 +78,5 @@ #define CONFIG_BOUNCE_BUFFER #endif +#define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS #endif /* __CONFIG_K2G_EVM_H */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 4adb119..202167b 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_K2HK_EVM_H #define __CONFIG_K2HK_EVM_H +#include <environment/ti/spi.h> + /* Platform type */ #define CONFIG_SOC_K2HK @@ -30,6 +32,8 @@ /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c200000 +#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS + /* NAND Configuration */ #define CONFIG_SYS_NAND_PAGE_2K diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 9bdd565..a7ccdd1 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_K2L_EVM_H #define __CONFIG_K2L_EVM_H +#include <environment/ti/spi.h> + /* Platform type */ #define CONFIG_SOC_K2L @@ -30,6 +32,8 @@ /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c100000 +#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS + /* NAND Configuration */ #define CONFIG_SYS_NAND_PAGE_4K diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 2ce39ff..258fd3a 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE SZ_128K /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index dfb7238..d8bbc80 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -269,12 +269,6 @@ #define CONFIG_LS102XA_STREAM_ID -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (30 * 1024) - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 15850f2..b349b36 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -537,12 +537,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LS102XA_STREAM_ID -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (30 * 1024) - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 5d6a64a..fcf035b 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -403,12 +403,6 @@ #define CONFIG_LS102XA_STREAM_ID -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (30 * 1024) - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 6a345c0..b14e944 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -396,12 +396,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_HZ 1000 -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (30 * 1024) - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 476387d..0cf6010 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -434,12 +434,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_HZ 1000 -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (30 * 1024) - #define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index a2ab77a..c04ae96 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -180,8 +180,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_STACKSIZE (128 * 1024) - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 3e7e5a3..f35d126 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -127,8 +127,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_512M) -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 8215e63..62159a1 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -113,8 +113,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_128M) -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 448b575..971f6c2 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -95,8 +95,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index aff7a24..e63da43 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -123,8 +123,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 71c22ff..f466c62 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -150,7 +150,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE SZ_128K /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index c65a9e5..5bc26aa 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -137,8 +137,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 81d769f..9807ace 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -178,8 +178,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index f6e4b3b..37f365d 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -88,7 +88,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE SZ_8K /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 6b128df..e99968c 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -48,7 +48,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#undef CONFIG_USE_IRQ /* no support for IRQs */ #define CONFIG_MISC_INIT_R #define CONFIG_SKIP_LOWLEVEL_INIT /* X-Loader set everything up */ @@ -381,13 +380,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 6700073..85e95b3 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ -#define CONFIG_STACKSIZE (256*1024) /* regular stack */ #define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 286598d..f506c9c 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -226,12 +226,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical memory map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (0x80000000) diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index dacb78a..9042dc2 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -37,7 +37,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x88000000 #define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN (4 << 10) -#define CONFIG_STACKSIZE (4 << 10) /* regular stack */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 8ad7fa6..26b1b11 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_CMDLINE_EDITING -#define CONFIG_STACKSIZE SZ_128K /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 0b12bf3..398b3aa 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -199,12 +199,6 @@ #define CONFIG_SYS_MALLOC_BASE (DDR_BASE_ADDR) #endif -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - #if 0 /* Configure PXE */ #define CONFIG_BOOTP_PXE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5a9ec02..d69f513 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -228,9 +228,6 @@ # define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #endif /* SPI support */ -/* Unsupported features */ -#undef CONFIG_USE_IRQ - #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_PHY_GIGE diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index a456e45..8609f2a 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -66,8 +66,6 @@ #define CONFIG_SYS_MALLOC_LEN (2 << 20) -#define CONFIG_STACKSIZE (64 << 10) - #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 55280f2..de3d661 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -12,9 +12,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x20050000 #define CONFIG_SYS_TEXT_BASE 0x08000000 -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF - /* * Configuration of the external SDRAM memory */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) -#define CONFIG_STACKSIZE (256 * 1024) #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" @@ -79,4 +75,5 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_MEM +#define CONFIG_CMD_CACHE #endif /* __CONFIG_H */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 171cea2..1d475b1 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -162,11 +162,6 @@ /* standalone support */ #define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR -/* baudrate */ - -/* The stack sizes are set up in start.S using the settings below */ -#define CONFIG_STACKSIZE (256 << 10) /* 256 KiB */ - /* FLASH and environment organization */ #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 035a932..3f2da57 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -196,13 +196,6 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 << 10) /* regular stack 128 KiB */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 319279e..baf818b 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -179,9 +179,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif -/* Unsupported features */ -#undef CONFIG_USE_IRQ - /* Ethernet */ #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 2840467..b5af700 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -137,7 +137,4 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif -/* Unsupported features */ -#undef CONFIG_USE_IRQ - #endif diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index a4ec4ce..b2950ef 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -117,8 +117,7 @@ "fit_loadaddr=0x88000000\0" \ "fit_bootfile=fitImage.itb\0" \ "update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \ - "args_fit=setenv bootargs console=${console} \0" \ - "loadfit=run args_fit; bootm ${loadaddr}#${fdtfile};\0" \ + "loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \ /* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index f76e0a5..5d2a7ab 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -28,7 +28,6 @@ #define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_LPAE_SDRAM_BASE 0x800000000 #define CONFIG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */ -#define CONFIG_STACKSIZE (512 << 10) /* 512 KiB */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE - \ GENERATED_GBL_DATA_SIZE) @@ -220,6 +219,10 @@ /* EDMA3 */ #define CONFIG_TI_EDMA3 +#define KERNEL_MTD_PARTS \ + "mtdparts=" \ + SPI_MTD_PARTS + #define DEFAULT_FW_INITRAMFS_BOOT_ENV \ "name_fw_rd=k2-fw-initrd.cpio.gz\0" \ "set_rd_spec=setenv rd_spec ${rdaddr}:${filesize}\0" \ @@ -276,7 +279,8 @@ "sf write ${loadaddr} 0 ${filesize}\0" \ "burn_uboot_nand=nand erase 0 0x100000; " \ "nand write ${loadaddr} 0 ${filesize}\0" \ - "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1\0" \ + "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 " \ + KERNEL_MTD_PARTS \ "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ "${nfs_options} ip=dhcp\0" \ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index e72332c..1bfc438 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -349,8 +349,6 @@ "panicboot=echo No boot device !!! reset\0" \ TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \ -#define CONFIG_STACKSIZE (128u * SZ_1K) - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 1d737cc..c6f39c3 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -69,7 +69,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) -#define CONFIG_STACKSIZE SZ_128K /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index ee90045..3e7dc9b 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -209,12 +209,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80010000 #define CONFIG_SYS_MEMTEST_END 0x87C00000 -/* - * Stack sizes - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - /* Physical memory map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (0x80000000) diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index ade5c27..9a517a9 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/warp.h b/include/configs/warp.h index 865f2ac..5274b27 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -35,8 +35,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M) -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/warp7.h b/include/configs/warp7.h index b3e1f2e..23b6eae 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -85,8 +85,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -#define CONFIG_STACKSIZE SZ_128K - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 3f837e8..f546c38 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -119,13 +119,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ - -/* * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 5169504..b1aa579 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -66,7 +66,6 @@ # define CONFIG_SYS_MONITOR_LEN 0x00040000 /* 256KB */ #endif -#define CONFIG_SYS_STACKSIZE (512 << 10) /* stack 512KB */ #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* heap 256KB */ /* Linux boot param area in RAM (used only when booting linux) */ @@ -110,7 +109,6 @@ /* U-Boot general configuration */ /*==============================*/ -#undef CONFIG_USE_IRQ /* Keep it simple, poll only */ #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MISC_INIT_R diff --git a/include/environment/ti/spi.h b/include/environment/ti/spi.h new file mode 100644 index 0000000..18c857c --- /dev/null +++ b/include/environment/ti/spi.h @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com + * + * Environment variable definitions for SPI on TI boards. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __TI_SPI_H +#define __TI_SPI_H + +#define KEYSTONE_SPI0_MTD_PARTS "spi0.0:1m(u-boot-spl)ro,-(misc);\0" +#define KEYSTONE_SPI1_MTD_PARTS "spi1.0:1m(u-boot-spl)ro,-(misc);\0" + +#endif diff --git a/include/xyzModem.h b/include/xyzModem.h index 0eddbbc..4b667f7 100644 --- a/include/xyzModem.h +++ b/include/xyzModem.h @@ -44,9 +44,6 @@ #define xyzModem_abort 2 -#ifdef REDBOOT -extern getc_io_funcs_t xyzModem_io; -#else #define CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT #define CYGACC_CALL_IF_SET_CONSOLE_COMM(x) @@ -60,12 +57,8 @@ typedef struct { char *filename; int mode; int chan; -#ifdef CYGPKG_REDBOOT_NETWORKING - struct sockaddr_in *server; -#endif } connection_info_t; -#endif int xyzModem_stream_open(connection_info_t *info, int *err); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 811ba91..04b6a95 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2859,9 +2859,6 @@ CONFIG_SSP1_BASE CONFIG_SSP2_BASE CONFIG_SSP3_BASE CONFIG_STACKBASE -CONFIG_STACKSIZE -CONFIG_STACKSIZE_FIQ -CONFIG_STACKSIZE_IRQ CONFIG_STANDALONE_LOAD_ADDR CONFIG_STATIC_BOARD_REV CONFIG_STATIC_RELA @@ -6052,7 +6049,6 @@ CONFIG_SYS_SSD_BASE CONFIG_SYS_SSD_BASE_PHYS CONFIG_SYS_SST_SECT CONFIG_SYS_SST_SECTSZ -CONFIG_SYS_STACKSIZE CONFIG_SYS_STACK_LENGTH CONFIG_SYS_STACK_SIZE CONFIG_SYS_STATUS_C @@ -6562,7 +6558,6 @@ CONFIG_USB_XHCI_PCI CONFIG_USER_LOWLEVEL_INIT CONFIG_USE_FDT CONFIG_USE_INTERRUPT -CONFIG_USE_IRQ CONFIG_USE_NAND CONFIG_USE_NETDEV CONFIG_USE_NOR |