avr32: add generic board
Subsystems (4)
v2 cover avr32: add generic board
This is the first attempt to add generic board support to avr32 architecture. It has at least one relevant part for other manual reloc architectures.
This series is currently runtime tested on grasshhopper and atstk1002.
Andreas Bie?mann
BEWARE:
The 'common/board_f: factor out reserve_stacks' patch is only partly compile tested for some ppc/arm boards yet.
Changes in v2:
- new since v1
- new since v1
- provide as extra patch, remove from avr32 generic board support
- remove bootparams allocation, provide as extra patch
- use the else path in setup_mon_len()
- provide arch_reserve_stacks() for avr32
- use the newly introduced dram_init()
Changes in v1:
- new since RFC
- new since RFC
- add timer_init in board_r
- remove extern declaration of mmu_init_r()
- new since RFC
Andreas Bie?mann (11):
avr32: use dlmalloc for DMA buffers
avr32: rename cpu_init() -> arch_cpu_init()
avr32: factor out cpu_mmc_init()
avr32: rename mmu.h definitions
avr32: convert to dram_init()
common/board_f: factor out reserve_stacks
common/board_r: manual relocation for cmd table
common/board_r: allocate bootparams
avr32: add generic board support
grasshopper: enable generic board
atstk1002: enable generic board
arch/arm/lib/Makefile | 1 + arch/arm/lib/stack.c | 44 ++++++++++++++ arch/avr32/config.mk | 3 + arch/avr32/cpu/Makefile | 1 + arch/avr32/cpu/at32ap700x/mmu.c | 8 +-- arch/avr32/cpu/cpu.c | 2 +- arch/avr32/cpu/mmc.c | 16 +++++ arch/avr32/cpu/u-boot.lds | 2 + arch/avr32/include/asm/arch-at32ap700x/mmu.h | 6 +- arch/avr32/include/asm/config.h | 1 + arch/avr32/include/asm/dma-mapping.h | 7 ++- arch/avr32/include/asm/u-boot.h | 10 ++++ arch/avr32/lib/Makefile | 4 ++ arch/avr32/lib/board.c | 81 ++++---------------------- arch/avr32/lib/dram_init.c | 17 ++++++ arch/avr32/lib/interrupts.c | 5 ++ arch/avr32/lib/stack.c | 23 ++++++++ arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/stack.c | 33 +++++++++++ board/atmel/atngw100/atngw100.c | 32 +++------- board/atmel/atngw100mkii/atngw100mkii.c | 39 ++++--------- board/atmel/atstk1000/atstk1000.c | 33 +++-------- board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 33 +++-------- board/in-circuit/grasshopper/grasshopper.c | 32 +++------- board/mimc/mimc200/mimc200.c | 38 ++++-------- board/miromico/hammerhead/hammerhead.c | 32 +++------- common/board_f.c | 48 +-------------- common/board_r.c | 40 ++++++++++++- include/asm-generic/u-boot.h | 4 ++ include/common.h | 9 +++ include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 5 +- include/configs/atstk1006.h | 1 - include/configs/favr-32-ezkit.h | 1 - include/configs/grasshopper.h | 5 +- include/configs/hammerhead.h | 1 - include/configs/mimc200.h | 1 - 38 files changed, 311 insertions(+), 310 deletions(-) create mode 100644 arch/arm/lib/stack.c create mode 100644 arch/avr32/cpu/mmc.c create mode 100644 arch/avr32/lib/dram_init.c create mode 100644 arch/avr32/lib/stack.c create mode 100644 arch/powerpc/lib/stack.c
Signature · 1 line
1.7.10.4
PATCH v2 1/11 avr32: use dlmalloc for DMA buffers
---
Changes in v2: None
Changes in v1: None
arch/avr32/include/asm/dma-mapping.h | 7 ++++- arch/avr32/lib/board.c | 51 ---------------------------------- include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/atstk1006.h | 1 - include/configs/favr-32-ezkit.h | 1 - include/configs/grasshopper.h | 1 - include/configs/hammerhead.h | 1 - include/configs/mimc200.h | 1 - 10 files changed, 6 insertions(+), 60 deletions(-)
arch/avr32/include/asm/dma-mapping.h +6 -1
@@ -14,7 +14,12 @@ enum dma_data_direction {DMA_TO_DEVICE =1 , DMA_FROM_DEVICE = 2, }; -extern void *dma_alloc_coherent (size_t len,unsigned long *handle); + +static inline void *dma_alloc_coherent (size_t len,unsigned long *handle) +{ + *handle = (unsigned long )memalign (ARCH_DMA_MINALIGN , len); +return (void *)*handle; +}static inline unsigned long dma_map_single (volatile void *vaddr,size_t len,enum dma_data_direction dir)
arch/avr32/lib/board.c +0 -51
69 lines not on this page · raw message
include/configs/atngw100.h +0 -1
@@ -143,7 +143,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
include/configs/atngw100mkii.h +0 -1
@@ -164,7 +164,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
include/configs/atstk1002.h +0 -1
@@ -158,7 +158,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
include/configs/atstk1006.h +0 -1
@@ -159,7 +159,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
include/configs/favr-32-ezkit.h +0 -1
@@ -162,7 +162,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
include/configs/grasshopper.h +0 -1
@@ -151,7 +151,6 @@ CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
include/configs/hammerhead.h +0 -1
@@ -137,7 +137,6 @@#define CONFIG_SYS_MALLOC_LEN (256*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x00400000)
include/configs/mimc200.h +0 -1
@@ -157,7 +157,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)#define CONFIG_SYS_MALLOC_LEN (1024*1024) -#define CONFIG_SYS_DMA_ALLOC_LEN (16384)/* Allow 4MB for the kernel run-time image */ #define CONFIG_SYS_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000)
Signature · 1 line
1.7.10.4
PATCH v2 2/11 avr32: rename cpu_init() -> arch_cpu_init()
In reply to Andreas Bießmann---
Changes in v2: None
Changes in v1: None
arch/avr32/cpu/cpu.c | 2 +- arch/avr32/include/asm/u-boot.h | 2 ++ arch/avr32/lib/board.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
arch/avr32/cpu/cpu.c +1 -1
@@ -27,7 +27,7 @@DECLARE_GLOBAL_DATA_PTR ; -int cpu_init (void ) +int arch_cpu_init (void ) {extern void _evba (void );
arch/avr32/include/asm/u-boot.h +2 -0
@@ -25,4 +25,6 @@ typedef struct bd_info {/* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_AVR32 +int arch_cpu_init (void ); +#endif /* __ASM_U_BOOT_H__ */
arch/avr32/lib/board.c +1 -1
@@ -98,7 +98,7 @@ void board_init_f(ulong board_type)/* Perform initialization sequence */ board_early_init_f (); -cpu_init (); +arch_cpu_init ();board_postclk_init ();env_init ();init_baudrate ();
Signature · 1 line
1.7.10.4
PATCH v2 2/11 avr32: rename cpu_init() -> arch_cpu_init()
Quoted 10 lines · Andreas Bie?mann
Signed-off-by Andreas Bie?mann <[email protected]>---
Changes in v2: None
Changes in v1: Nonearch/avr32/cpu/cpu.c | 2 +- arch/avr32/include/asm/u-boot.h | 2 ++ arch/avr32/lib/board.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
PATCH v2 3/11 avr32: factor out cpu_mmc_init()
In reply to Andreas Bießmanncpu_mmc_init() is required by the init sequence to have a working MMC interface on avr32. This will not be included in the binary if we omit the avr32 board.c when building the generic board.
---
Changes in v2: None
Changes in v1:
- new since RFC
arch/avr32/cpu/Makefile | 1 + arch/avr32/cpu/mmc.c | 16 ++++++++++++++++ arch/avr32/lib/board.c | 8 -------- 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 arch/avr32/cpu/mmc.c
arch/avr32/cpu/Makefile +1 -0
@@ -16,5 +16,6 @@ obj-y += cache.o obj-y += interrupts.o obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o +obj-y += mmc.o obj-$(if $(filter at32ap700x,$(SOC)),y) += at32ap700x/
arch/avr32/cpu/mmc.c new file +16 -0
@@ -0,0 +1,16 @@ +/* +* Copyright (C) 2004-2006 Atmel Corporation +* Copyright (C) 2015 Andreas Bie?mann <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#include <common.h> +#include <atmel_mci.h> +#include <asm/arch/hardware.h> + +/* provide cpu_mmc_init, to overwrite provide board_mmc_init */ +int cpu_mmc_init (bd_t *bd) +{ +/* This calls the atmel_mci_init in gen_atmel_mci.c */ +return atmel_mci_init ((void *)ATMEL_BASE_MMCI ); +}
arch/avr32/lib/board.c +0 -8
@@ -9,7 +9,6 @@#include <stdio_dev.h> #include <version.h> #include <net.h> -#include <atmel_mci.h> #ifdef CONFIG_BITBANGMII #include <miiphy.h>
@@ -38,13 +37,6 @@ static int __do_nothing(void)int board_postclk_init (void ) __attribute__((weak,alias ("__do_nothing" )));int board_early_init_r (void ) __attribute__((weak,alias ("__do_nothing" ))); -/* provide cpu_mmc_init, to overwrite provide board_mmc_init */ -int cpu_mmc_init (bd_t *bd) -{ -/* This calls the atmel_mci_init in gen_atmel_mci.c */ -return atmel_mci_init ((void *)ATMEL_BASE_MMCI ); -} -static int init_baudrate (void ) { gd->baudrate =getenv_ulong ("baudrate" ,10 ,CONFIG_BAUDRATE );
Signature · 1 line
1.7.10.4
PATCH v2 4/11 avr32: rename mmu.h definitions
In reply to Andreas BießmannPrefix mmu.h PAGE_xxx definitions with MMU_ in order to prevent a naming conflict with other definitions.
---
Changes in v2: None
Changes in v1:
- new since RFC
arch/avr32/cpu/at32ap700x/mmu.c | 8 ++++---- arch/avr32/include/asm/arch-at32ap700x/mmu.h | 6 +++--- board/atmel/atngw100/atngw100.c | 12 ++++++------ board/atmel/atngw100mkii/atngw100mkii.c | 18 +++++++++--------- board/atmel/atstk1000/atstk1000.c | 12 ++++++------ board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 12 ++++++------ board/in-circuit/grasshopper/grasshopper.c | 12 ++++++------ board/mimc/mimc200/mimc200.c | 18 +++++++++--------- board/miromico/hammerhead/hammerhead.c | 12 ++++++------ 9 files changed, 55 insertions(+), 55 deletions(-)
arch/avr32/cpu/at32ap700x/mmu.c +4 -4
@@ -7,7 +7,7 @@ void mmu_init_r(unsigned long dest_addr)uintptr_t vmr_table_addr;/* Round monitor address down to the nearest page boundary */ - dest_addr &=PAGE_ADDR_MASK ; + dest_addr &=MMU_PAGE_ADDR_MASK ;/* Initialize TLB entry 0 to cover the monitor, and lock it */ sysreg_write (TLBEHI , dest_addr |SYSREG_BIT (TLBEHI_V ));
@@ -36,7 +36,7 @@ int mmu_handle_tlb_miss(void)unsigned int fault_pgno;int first, last; - fault_pgno =sysreg_read (TLBEAR ) >>PAGE_SHIFT ; + fault_pgno =sysreg_read (TLBEAR ) >>MMU_PAGE_SHIFT ; vmr_table = (const struct mmu_vm_range *)sysreg_read (PTBR );/* Do a binary search through the VM ranges */
@@ -60,8 +60,8 @@ int mmu_handle_tlb_miss(void)/* Got it; let's slam it into the TLB */ uint32_t tlbelo; - tlbelo = vmr->phys & ~PAGE_ADDR_MASK ; - tlbelo |= fault_pgno <<PAGE_SHIFT ; + tlbelo = vmr->phys & ~MMU_PAGE_ADDR_MASK ; + tlbelo |= fault_pgno <<MMU_PAGE_SHIFT ;sysreg_write (TLBELO , tlbelo);__builtin_tlbw ();
arch/avr32/include/asm/arch-at32ap700x/mmu.h +3 -3
@@ -13,9 +13,9 @@#include <asm/sysreg.h> -#define PAGE_SHIFT 20 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_ADDR_MASK (~(PAGE_SIZE - 1)) +#define MMU_PAGE_SHIFT 20 +#define MMU_PAGE_SIZE (1UL << MMU_PAGE_SHIFT) +#define MMU_PAGE_ADDR_MASK (~(MMU_PAGE_SIZE - 1))#define MMU_VMR_CACHE_NONE \ (SYSREG_BF(AP, 3) | SYSREG_BF(SZ, 3) | SYSREG_BIT(TLBELO_D))
board/atmel/atngw100/atngw100.c +6 -6
@@ -18,14 +18,14 @@ DECLARE_GLOBAL_DATA_PTR;struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { { - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
board/atmel/atngw100mkii/atngw100mkii.c +9 -9
@@ -23,21 +23,21 @@ DECLARE_GLOBAL_DATA_PTR;struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { {/* Atmel AT49BV640D 8 MiB x16 NOR flash on NCS0 */ - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, {/* Micron MT29F2G16AAD 256 MiB x16 NAND flash on NCS3 */ - .virt_pgno =EBI_SRAM_CS3_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SRAM_CS3_SIZE >>PAGE_SHIFT , - .phys = (EBI_SRAM_CS3_BASE >>PAGE_SHIFT ) + .virt_pgno =EBI_SRAM_CS3_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SRAM_CS3_SIZE >>MMU_PAGE_SHIFT , + .phys = (EBI_SRAM_CS3_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, {/* 2x16-bit ISSI IS42S16320B 64 MiB SDRAM (128 MiB total) */ - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
board/atmel/atstk1000/atstk1000.c +6 -6
@@ -17,14 +17,14 @@ DECLARE_GLOBAL_DATA_PTR;struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { { - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c +6 -6
@@ -17,14 +17,14 @@ DECLARE_GLOBAL_DATA_PTR;struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { { - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
board/in-circuit/grasshopper/grasshopper.c +6 -6
@@ -18,14 +18,14 @@ DECLARE_GLOBAL_DATA_PTR;struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { { - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
board/mimc/mimc200/mimc200.c +9 -9
@@ -20,19 +20,19 @@struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { { - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =EBI_SRAM_CS2_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SRAM_CS2_SIZE >>PAGE_SHIFT , - .phys = (EBI_SRAM_CS2_BASE >>PAGE_SHIFT ) + .virt_pgno =EBI_SRAM_CS2_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SRAM_CS2_SIZE >>MMU_PAGE_SHIFT , + .phys = (EBI_SRAM_CS2_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
board/miromico/hammerhead/hammerhead.c +6 -6
@@ -21,14 +21,14 @@ DECLARE_GLOBAL_DATA_PTR;struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS ] = { { - .virt_pgno =CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT , - .nr_pages =CONFIG_SYS_FLASH_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_FLASH_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT , + .nr_pages =CONFIG_SYS_FLASH_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_FLASH_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_NONE , }, { - .virt_pgno =CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT , - .nr_pages =EBI_SDRAM_SIZE >>PAGE_SHIFT , - .phys = (CONFIG_SYS_SDRAM_BASE >>PAGE_SHIFT ) + .virt_pgno =CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT , + .nr_pages =EBI_SDRAM_SIZE >>MMU_PAGE_SHIFT , + .phys = (CONFIG_SYS_SDRAM_BASE >>MMU_PAGE_SHIFT ) |MMU_VMR_CACHE_WRBACK , }, };
Signature · 1 line
1.7.10.4
PATCH v2 5/11 avr32: convert to dram_init()
In reply to Andreas Bießmann---
Changes in v2:
- new since v1
Changes in v1: None
arch/avr32/include/asm/u-boot.h | 1 + arch/avr32/lib/Makefile | 1 + arch/avr32/lib/board.c | 20 ++++++++++---------- arch/avr32/lib/dram_init.c | 17 +++++++++++++++++ board/atmel/atngw100/atngw100.c | 20 ++------------------ board/atmel/atngw100mkii/atngw100mkii.c | 21 +++------------------ board/atmel/atstk1000/atstk1000.c | 21 +++------------------ board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 21 +++------------------ board/in-circuit/grasshopper/grasshopper.c | 20 ++------------------ board/mimc/mimc200/mimc200.c | 20 ++------------------ board/miromico/hammerhead/hammerhead.c | 20 ++------------------ 11 files changed, 46 insertions(+), 136 deletions(-) create mode 100644 arch/avr32/lib/dram_init.c
arch/avr32/include/asm/u-boot.h +1 -0
@@ -26,5 +26,6 @@ typedef struct bd_info {#define IH_ARCH_DEFAULT IH_ARCH_AVR32int arch_cpu_init (void ); +int dram_init (void );#endif /* __ASM_U_BOOT_H__ */
arch/avr32/lib/Makefile +1 -0
@@ -11,3 +11,4 @@ obj-y += memset.o obj-y += board.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += interrupts.o +obj-y += dram_init.o
arch/avr32/lib/board.c +10 -10
@@ -29,6 +29,12 @@ DECLARE_GLOBAL_DATA_PTR;unsigned long monitor_flash_len; +__weak void dram_init_banksize (void ) +{ + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size = gd->ram_size; +} +/* Weak aliases for optional board functions */ static int __do_nothing (void ) {
@@ -82,7 +88,6 @@ void board_init_f(ulong board_type)unsigned long monitor_len;unsigned long monitor_addr;unsigned long addr; -long sdram_size;/* Initialize the global data pointer */ memset (&gd_data,0 ,sizeof (gd_data));
@@ -97,10 +102,10 @@ void board_init_f(ulong board_type)serial_init ();console_init_f ();display_banner (); - sdram_size =initdram (board_type); +dram_init ();/* If we have no SDRAM, we can't go on */ -if (sdram_size <=0 ) +if (gd->ram_size <=0 )panic ("No working SDRAM available\n" );/*
@@ -114,7 +119,7 @@ void board_init_f(ulong board_type)* - global data struct * - stack */ - addr =CONFIG_SYS_SDRAM_BASE + sdram_size; + addr =CONFIG_SYS_SDRAM_BASE + gd->ram_size; monitor_len = (char *)(&__bss_end) - _text;/*
@@ -156,12 +161,7 @@ void board_init_f(ulong board_type) *(--new_sp) =0 ; *(--new_sp) =0 ; -/* -* Initialize the board information struct with the -* information we have. -*/ - bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; - bd->bi_dram[0 ].size = sdram_size; +dram_init_banksize ();memcpy (new_gd, gd,sizeof (gd_t));
arch/avr32/lib/dram_init.c new file +17 -0
@@ -0,0 +1,17 @@ +/* +* Copyright (C) 2015 Andreas Bie?mann <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int dram_init (void ) +{ +/* check for the maximum amount of memory possible on AP7000 devices */ + gd->ram_size =get_ram_size ( + (void *)CONFIG_SYS_SDRAM_BASE , + (256 <<20 )); +return 0 ; +}
board/atmel/atngw100/atngw100.c +2 -18
@@ -52,6 +52,8 @@ int board_early_init_f(void)hmatrix_slave_write (EBI ,SFR ,HMATRIX_BIT (EBI_SDRAM_ENABLE ));portmux_enable_ebi (16 ,23 ,0 ,PORTMUX_DRIVE_HIGH ); +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart1 (PORTMUX_DRIVE_MIN );#if defined(CONFIG_MACB )
@@ -68,24 +70,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x01 ;
board/atmel/atngw100mkii/atngw100mkii.c +3 -18
@@ -69,6 +69,9 @@ int board_early_init_f(void)portmux_select_gpio (PORTMUX_PORT_E ,1 <<23 ,PORTMUX_DIR_OUTPUT |PORTMUX_INIT_HIGH |PORTMUX_DRIVE_MIN ); + +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart1 (PORTMUX_DRIVE_MIN );#if defined(CONFIG_MACB )
@@ -85,24 +88,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x01 ;
board/atmel/atstk1000/atstk1000.c +3 -18
@@ -78,7 +78,10 @@ int board_early_init_f(void)hmatrix_slave_write (EBI ,SFR ,HMATRIX_BIT (EBI_SDRAM_ENABLE ));portmux_enable_ebi (sdram_config.data_bits,23 ,0 ,PORTMUX_DRIVE_HIGH ); +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart1 (PORTMUX_DRIVE_MIN ); +#if defined(CONFIG_MACB )portmux_enable_macb0 (PORTMUX_MACB_MII ,PORTMUX_DRIVE_LOW );portmux_enable_macb1 (PORTMUX_MACB_MII ,PORTMUX_DRIVE_LOW );
@@ -90,24 +93,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x10 ;
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c +3 -18
@@ -52,6 +52,9 @@ int board_early_init_f(void)hmatrix_slave_write (EBI ,SFR ,HMATRIX_BIT (EBI_SDRAM_ENABLE ));portmux_enable_ebi (32 ,23 ,0 ,PORTMUX_DRIVE_HIGH ); + +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart3 (PORTMUX_DRIVE_MIN );#if defined(CONFIG_MACB )portmux_enable_macb0 (PORTMUX_MACB_MII ,PORTMUX_DRIVE_HIGH );
@@ -63,24 +66,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x01 ;
board/in-circuit/grasshopper/grasshopper.c +2 -18
@@ -53,6 +53,8 @@ int board_early_init_f(void)hmatrix_slave_write (EBI ,SFR ,HMATRIX_BIT (EBI_SDRAM_ENABLE ));portmux_enable_ebi (SDRAM_DATA_32BIT ,23 ,0 ,PORTMUX_DRIVE_HIGH ); +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart0 (PORTMUX_DRIVE_MIN );portmux_enable_usart1 (PORTMUX_DRIVE_MIN );#if defined(CONFIG_MACB )
@@ -69,24 +71,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x00 ;
board/mimc/mimc200/mimc200.c +2 -18
@@ -91,6 +91,8 @@ int board_early_init_f(void)/* Enable 26 address bits and NCS2 */ portmux_enable_ebi (16 ,26 ,PORTMUX_EBI_CS (2 ),PORTMUX_DRIVE_HIGH ); +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart1 (PORTMUX_DRIVE_MIN );/* de-assert "force sys reset" pin */
@@ -151,24 +153,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x01 ;
board/miromico/hammerhead/hammerhead.c +2 -18
@@ -63,6 +63,8 @@ int board_early_init_f(void)hmatrix_slave_write (EBI ,SFR ,HMATRIX_BIT (EBI_SDRAM_ENABLE ));portmux_enable_ebi (32 ,23 ,0 ,PORTMUX_DRIVE_HIGH ); +sdram_init (uncached (EBI_SDRAM_BASE ), &sdram_config); +portmux_enable_usart1 (PORTMUX_DRIVE_MIN );#if defined(CONFIG_MACB )
@@ -74,24 +76,6 @@ int board_early_init_f(void)return 0 ; } -phys_size_t initdram (int board_type) -{ -unsigned long expected_size; -unsigned long actual_size; -void *sdram_base; - - sdram_base =uncached (EBI_SDRAM_BASE ); - - expected_size =sdram_init (sdram_base, &sdram_config); - actual_size =get_ram_size (sdram_base, expected_size); - -if (expected_size != actual_size) -printf ("Warning: Only %lu of %lu MiB SDRAM is working\n" , - actual_size >>20 , expected_size >>20 ); - -return actual_size; -} -int board_early_init_r (void ) { gd->bd->bi_phy_id[0 ] =0x01 ;
Signature · 1 line
1.7.10.4
PATCH v2 5/11 avr32: convert to dram_init()
Quoted 8 lines · Andreas Bie?mann
Signed-off-by Andreas Bie?mann <[email protected]>---
Changes in v2:
- new since v1Changes in v1: None
Quoted 14 lines
arch/avr32/include/asm/u-boot.h | 1 + arch/avr32/lib/Makefile | 1 + arch/avr32/lib/board.c | 20 ++++++++++---------- arch/avr32/lib/dram_init.c | 17 +++++++++++++++++ board/atmel/atngw100/atngw100.c | 20 ++------------------ board/atmel/atngw100mkii/atngw100mkii.c | 21 +++------------------ board/atmel/atstk1000/atstk1000.c | 21 +++------------------ board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 21 +++------------------ board/in-circuit/grasshopper/grasshopper.c | 20 ++------------------ board/mimc/mimc200/mimc200.c | 20 ++------------------ board/miromico/hammerhead/hammerhead.c | 20 ++------------------ 11 files changed, 46 insertions(+), 136 deletions(-) create mode 100644 arch/avr32/lib/dram_init.c
PATCH v2 6/11 common/board_f: factor out reserve_stacks
In reply to Andreas BießmannRequire each architecture to provide an arch_reserve_stacks() function to setup the required stacks for the architecture.
---
This patch is _not_ fully compile tested for all ppc/arm boards!
Changes in v2:
- new since v1
Changes in v1: None
arch/arm/lib/Makefile | 1 + arch/arm/lib/stack.c | 44 +++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/stack.c | 33 ++++++++++++++++++++++++++++++++ common/board_f.c | 46 +-------------------------------------------- include/common.h | 9 +++++++++ 6 files changed, 89 insertions(+), 45 deletions(-) create mode 100644 arch/arm/lib/stack.c create mode 100644 arch/powerpc/lib/stack.c
arch/arm/lib/Makefile +1 -0
@@ -35,6 +35,7 @@ endif obj-$(CONFIG_SEMIHOSTING) += semihosting.o obj-y += sections.o +obj-y += stack.o ifdef CONFIG_ARM64 obj-y += gic_64.o obj-y += interrupts_64.o
arch/arm/lib/stack.c new file +44 -0
44 lines not on this page · raw message
arch/powerpc/lib/Makefile +1 -0
@@ -40,6 +40,7 @@ obj-y += extable.o obj-y += interrupts.o obj-$(CONFIG_CMD_KGDB) += kgdb.o obj-$(CONFIG_CMD_IDE) += ide.o +obj-y += stack.o obj-y += time.o # Don't include the MPC5xxx special memcpy into the
arch/powerpc/lib/stack.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright (c) 2015 Andreas Bie?mann <[email protected]> +* +* Copyright (c) 2011 The Chromium OS Authors. +* (C) Copyright 2002-2006 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +* +* (C) Copyright 2002 +* Sysgo Real-Time Solutions, GmbH <www.elinos.com> +* Marius Groeger <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int arch_reserve_stacks (void ) +{ +ulong *s; + +/* setup stack pointer for exceptions */ + gd->start_addr_sp -=16 ; + gd->start_addr_sp &= ~0xf ; + gd->irq_sp = gd->start_addr_sp; + +/* Clear initial stack frame */ + s = (ulong *)gd->start_addr_sp; + *s =0 ;/* Terminate back chain */ + *++s =0 ;/* NULL return address */ + +return 0 ; +}
common/board_f.c +1 -45
58 lines not on this page · raw message
include/common.h +9 -0
@@ -251,6 +251,15 @@ int update_flash_size(int flash_size);int arch_early_init_r (void );/** +* Reserve all necessary stacks +* +* This is used in generic board init sequence in common/board_f.c. Each +* architecture should provide this function and set the gd->start_addr_sp and +* gd->irq_sp accordingly. +*/ +int arch_reserve_stacks (void ); + +/** * Show the DRAM size in a board-specific way * * This is used by boards to display DRAM information in their own way.
Signature · 1 line
1.7.10.4
PATCH v2 6/11 common/board_f: factor out reserve_stacks
Hi Andreas,
Quoted 176 lines · Andreas Bie?mann
Require each architecture to provide an
arch_reserve_stacks()function to setup the required stacks for the architecture.Signed-off-by Andreas Bie?mann <[email protected]>---
This patch is _not_ fully compile tested for all ppc/arm boards!Changes in v2:
- new since v1Changes in v1: None
arch/arm/lib/Makefile | 1 + arch/arm/lib/stack.c | 44 +++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/stack.c | 33 ++++++++++++++++++++++++++++++++ common/board_f.c | 46 +-------------------------------------------- include/common.h | 9 +++++++++ 6 files changed, 89 insertions(+), 45 deletions(-) create mode 100644 arch/arm/lib/stack.c create mode 100644 arch/powerpc/lib/stack.carch/arm/lib/Makefile +1
-0@@ -35,6 +35,7 @@ endif obj-$(CONFIG_SEMIHOSTING) += semihosting.o obj-y += sections.o +obj-y += stack.o ifdef CONFIG_ARM64 obj-y += gic_64.o obj-y += interrupts_64.oarch/arm/lib/stack.c new file +44
-0@@ -0,0 +1,44 @@ +/* +* Copyright (c) 2015 Andreas Bie?mann <[email protected]> +* +* Copyright (c) 2011 The Chromium OS Authors. +* (C) Copyright 2002-2006 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +* +* (C) Copyright 2002 +* Sysgo Real-Time Solutions, GmbH <www.elinos.com> +* Marius Groeger <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int arch_reserve_stacks (void ) +{ +#ifdef CONFIG_SPL_BUILD + gd->start_addr_sp -=128 ;/* leave 32 words for abort-stack */ + gd->irq_sp = gd->start_addr_sp; +#else +/* setup stack pointer for exceptions */ + gd->start_addr_sp -=16 ; + gd->start_addr_sp &= ~0xf ; + 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 +#endif + +return 0 ; +}arch/powerpc/lib/Makefile +1
-0@@ -40,6 +40,7 @@ obj-y += extable.o obj-y += interrupts.o obj-$(CONFIG_CMD_KGDB) += kgdb.o obj-$(CONFIG_CMD_IDE) += ide.o +obj-y += stack.o obj-y += time.o # Don't include the MPC5xxx special memcpy into thearch/powerpc/lib/stack.c new file +33
-0@@ -0,0 +1,33 @@ +/* +* Copyright (c) 2015 Andreas Bie?mann <[email protected]> +* +* Copyright (c) 2011 The Chromium OS Authors. +* (C) Copyright 2002-2006 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de. +* +* (C) Copyright 2002 +* Sysgo Real-Time Solutions, GmbH <www.elinos.com> +* Marius Groeger <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int arch_reserve_stacks (void ) +{ +ulong *s; + +/* setup stack pointer for exceptions */ + gd->start_addr_sp -=16 ; + gd->start_addr_sp &= ~0xf ; + gd->irq_sp = gd->start_addr_sp; + +/* Clear initial stack frame */ + s = (ulong *)gd->start_addr_sp; + *s =0 ;/* Terminate back chain */ + *++s =0 ;/* NULL return address */ + +return 0 ; +}common/board_f.c +0
-33@@ -573,50 +573,6 @@ static int reserve_fdt(void)return 0 ; } -static int reserve_stacks (void ) -{ -#ifdef CONFIG_SPL_BUILD -# ifdef CONFIG_ARM - gd->start_addr_sp -=128 ;/* leave 32 words for abort-stack */ - gd->irq_sp = gd->start_addr_sp; -# endif -#else -# ifdef CONFIG_PPC -ulong *s; -# endif - -/* setup stack pointer for exceptions */ - gd->start_addr_sp -=16 ; - gd->start_addr_sp &= ~0xf ; - gd->irq_sp = gd->start_addr_sp; - -/* -* Handle architecture-specific things here -* TODO(sjg at chromium.org): Perhaps create arch_reserve_stack() -* to handle this and put in arch/xxx/lib/stack.c -*/ -# if defined(CONFIG_ARM ) && !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 ;
common/board_f.c static int reserve_fdt(void) · line 618
Quoted 10 lines
common/board_f.c +0
-10-# elif defined(CONFIG_PPC ) -/* Clear initial stack frame */ - s = (ulong *) gd->start_addr_sp; - *s =0 ;/* Terminate back chain */ - *++s =0 ;/* NULL return address */ -# endif /* Architecture specific code */ - -return 0 ; -#endif -}
It's nice to see this clean-up.
This does force every arch to provide this function. For some architectures I suspect that this will be enough:
gd->start_addr_sp -= 16;
gd->start_addr_sp &= ~0xf;So I think it might be better to put that code in reserve_stacks() and then call a weak arch_reserve_stacks() after that.
Quoted 18 lines
common/board_f.c +1
-2-static int display_new_sp (void ) {debug ("New Stack Pointer is: %08lx\n" , gd->start_addr_sp);@@ -977,7 +933,7 @@ static init_fnc_t init_sequence_f[] = { reserve_global_data, reserve_fdt, reserve_arch, - reserve_stacks, + arch_reserve_stacks, setup_dram_config, show_dram_config, #ifdef CONFIG_PPCinclude/common.h +0
-0
include/common.h int update_flash_size(int flash_size); · line 258
Quoted 8 lines
include/common.h +5
-0@@ -251,6 +251,15 @@ int update_flash_size(int flash_size);int arch_early_init_r (void );/** +* Reserve all necessary stacks +* +* This is used in generic board init sequence in common/board_f.c. Each +* architecture should provide this function and set the gd->start_addr_sp and +* gd->irq_sp accordingly.
Should add a little more detail here:
On entry gd->start_addr_sp is pointing to the suggested top of the stack On exit this should be updated to the position of the stack. The stack pointer will be set to this latergd->irq_sp should be set if this is needed by the arch.
also @return 0 if no error
Quoted 10 lines
include/common.h +4
-1+*/ +int arch_reserve_stacks (void ); + +/** * Show the DRAM size in a board-specific way * * This is used by boards to display DRAM information in their own way. -- 1.7.10.4
PATCH v2 7/11 common/board_r: manual relocation for cmd table
In reply to Andreas BießmannThis is required for architectures still need manual relocation like avr32, m68k microblaze and maybe others.
---
Changes in v2: None
Changes in v1: None
common/board_r.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
common/board_r.c +12 -0
@@ -294,6 +294,15 @@ static int initr_announce(void)return 0 ; } +#ifdef CONFIG_NEEDS_MANUAL_RELOC +static int initr_manual_reloc_cmdtable (void ) +{ +fixup_cmdtable (ll_entry_start (cmd_tbl_t, cmd), +ll_entry_count (cmd_tbl_t, cmd)); +return 0 ; +} +#endif +#if !defined(CONFIG_SYS_NO_FLASH )static int initr_flash (void ) {
@@ -718,6 +727,9 @@ init_fnc_t init_sequence_r[] = { initr_serial, initr_announce, INIT_FUNC_WATCHDOG_RESET +#ifdef CONFIG_NEEDS_MANUAL_RELOC + initr_manual_reloc_cmdtable, +#endif #ifdef CONFIG_PPC initr_trap,#endif
Signature · 1 line
1.7.10.4
PATCH v2 8/11 common/board_r: allocate bootparams
In reply to Andreas Bießmann---
Changes in v2:
- provide as extra patch, remove from avr32 generic board support
Changes in v1: None
common/board_r.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
common/board_r.c +15 -0
@@ -459,6 +459,18 @@ static int initr_env(void)return 0 ; } +#ifdef CONFIG_SYS_BOOTPARAMS_LEN +static int initr_malloc_bootparams (void ) +{ + gd->bd->bi_boot_params = (ulong )malloc (CONFIG_SYS_BOOTPARAMS_LEN ); +if (!gd->bd->bi_boot_params) { +puts ("WARNING: Cannot allocate space for boot parameters\n" ); +return -ENOMEM ; + } +return 0 ; +} +#endif +#ifdef CONFIG_SC3 /* TODO: with new initcalls, move this into the driver */ extern void sc3_read_eeprom (void );
@@ -791,6 +803,9 @@ init_fnc_t init_sequence_r[] = { initr_dataflash, #endif initr_env, +#ifdef CONFIG_SYS_BOOTPARAMS_LEN + initr_malloc_bootparams, +#endif INIT_FUNC_WATCHDOG_RESET initr_secondary_cpu, #ifdef CONFIG_SC3
Signature · 1 line
1.7.10.4
PATCH v2 8/11 common/board_r: allocate bootparams
Quoted 11 lines · Andreas Bie?mann
Signed-off-by Andreas Bie?mann <[email protected]>---
Changes in v2:
- provide as extra patch, remove from avr32 generic board supportChanges in v1: None
common/board_r.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
PATCH v2 9/11 avr32: add generic board support
In reply to Andreas Bießmann---
This version still has the mmu_init_r() in common/board_r. Removing this now is not that easy ... I'd love to get it in as is and change it later to the board_init_f_r() sequence.
Changes in v2:
- remove bootparams allocation, provide as extra patch
- use the else path in setup_mon_len()
- provide arch_reserve_stacks() for avr32
- use the newly introduced dram_init()
Changes in v1:
- add timer_init in board_r
- remove extern declaration of mmu_init_r()
arch/avr32/config.mk | 3 +++ arch/avr32/cpu/u-boot.lds | 2 ++ arch/avr32/include/asm/config.h | 1 + arch/avr32/include/asm/u-boot.h | 7 +++++++ arch/avr32/lib/Makefile | 3 +++ arch/avr32/lib/interrupts.c | 5 +++++ arch/avr32/lib/stack.c | 23 +++++++++++++++++++++++ common/board_f.c | 2 +- common/board_r.c | 13 ++++++++++--- include/asm-generic/u-boot.h | 4 ++++ 10 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 arch/avr32/lib/stack.c
arch/avr32/config.mk +3 -0
@@ -9,6 +9,9 @@ ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := avr32-linux- endif +# avr32 has generic board support +__HAVE_ARCH_GENERIC_BOARD := y + CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax
arch/avr32/cpu/u-boot.lds +2 -0
@@ -48,9 +48,11 @@ SECTIONS _edata = .; .bss (NOLOAD) : { + __bss_start = .; *(.bss) *(.bss.*) } . = ALIGN(8); __bss_end = .; + __init_end = .; }
arch/avr32/include/asm/config.h +1 -0
@@ -8,5 +8,6 @@#define _ASM_CONFIG_H_#define CONFIG_NEEDS_MANUAL_RELOC +#define CONFIG_SYS_GENERIC_GLOBAL_DATA #endif
arch/avr32/include/asm/u-boot.h +7 -0
@@ -6,6 +6,11 @@ #ifndef __ASM_U_BOOT_H__ #define __ASM_U_BOOT_H__ 1 +#ifdef CONFIG_SYS_GENERIC_BOARD +/* Use the generic board which requires a unified bd_info */ +#include <asm-generic/u-boot.h> +#else + typedef struct bd_info { unsigned char bi_phy_id[4]; unsigned long bi_board_number;
@@ -22,6 +27,8 @@ typedef struct bd_info {#define bi_memstart bi_dram[0].start#define bi_memsize bi_dram[0].size +#endif +/* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_AVR32
arch/avr32/lib/Makefile +3 -0
@@ -8,7 +8,10 @@ # obj-y += memset.o +ifndef CONFIG_SYS_GENERIC_BOARD obj-y += board.o +endif obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += interrupts.o obj-y += dram_init.o +obj-y += stack.o
arch/avr32/lib/interrupts.c +5 -0
@@ -7,6 +7,11 @@#include <asm/sysreg.h> +int interrupt_init (void ) +{ +return 0 ; +} +void enable_interrupts (void ) { asmvolatile ("csrf %0" : :"n" (SYSREG_GM_OFFSET ));
arch/avr32/lib/stack.c new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Copyright (C) 2015 Andreas Bie?mann <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#include <common.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int arch_reserve_stacks (void ) +{ +ulong *s; + + gd->start_addr_sp &= ~0xf ; + + gd->arch.stack_end = gd->start_addr_sp; + + s = (ulong *)gd->start_addr_sp; + *s =0 ; + *--s =0 ; + +return 0 ; +}
common/board_f.c +1 -1
@@ -865,7 +865,7 @@ static init_fnc_t init_sequence_f[] = {#endif announce_dram_init,/* TODO: unify all these dram functions? */ -#if defined(CONFIG_ARM ) || defined(CONFIG_X86 ) +#if defined(CONFIG_ARM ) || defined(CONFIG_X86 ) || defined(CONFIG_AVR32 ) dram_init, /* configure available RAM banks */#endif #if defined(CONFIG_MIPS ) || defined(CONFIG_PPC )
common/board_r.c +10 -3
@@ -55,6 +55,9 @@#include <dm/root.h> #include <linux/compiler.h> #include <linux/err.h> +#ifdef CONFIG_AVR32 +#include <asm/arch/mmu.h> +#endif DECLARE_GLOBAL_DATA_PTR ;
@@ -514,7 +517,7 @@ static int show_model_r(void)#endif /* enable exceptions */ -#ifdef CONFIG_ARM +#if defined(CONFIG_ARM ) || defined(CONFIG_AVR32 )static int initr_enable_interrupts (void ) {enable_interrupts ();
@@ -841,10 +844,10 @@ init_fnc_t init_sequence_r[] = { initr_kgdb, #endif interrupt_init, -#if defined(CONFIG_ARM ) +#if defined(CONFIG_ARM ) || defined(CONFIG_AVR32 ) initr_enable_interrupts,#endif -#ifdef CONFIG_X86 +#if defined(CONFIG_X86 ) || defined(CONFIG_AVR32 ) timer_init, /* initialize timer */#endif #if defined(CONFIG_STATUS_LED ) && defined(STATUS_LED_BOOT )
@@ -909,6 +912,10 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)int i;#endif +#ifdef CONFIG_AVR32 +mmu_init_r (dest_addr); +#endif +#if !defined(CONFIG_X86 ) && !defined(CONFIG_ARM ) && !defined(CONFIG_ARM64 ) gd = new_gd;#endif
include/asm-generic/u-boot.h +4 -0
@@ -32,6 +32,10 @@ typedef struct bd_info {unsigned long bi_flashoffset;/* reserved area for startup monitor */ unsigned long bi_sramstart;/* start of SRAM memory */ unsigned long bi_sramsize;/* size of SRAM memory */ +#ifdef CONFIG_AVR32 +unsigned char bi_phy_id[4 ];/* PHY address for ATAG_ETHERNET */ +unsigned long bi_board_number;/* ATAG_BOARDINFO */ +#endif #ifdef CONFIG_ARM unsigned long bi_arm_freq;/* arm frequency */ unsigned long bi_dsp_freq;/* dsp core frequency */
Signature · 1 line
1.7.10.4
PATCH v2 10/11 grasshopper: enable generic board
In reply to Andreas Bießmann---
Changes in v2: None
Changes in v1: None
include/configs/grasshopper.h | 4 ++++ 1 file changed, 4 insertions(+)
include/configs/grasshopper.h +4 -0
@@ -62,6 +62,10 @@#define CONFIG_USART_BASE ATMEL_BASE_USART1#define CONFIG_USART_ID 1 +#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R +/* User serviceable stuff */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS
Signature · 1 line
1.7.10.4
PATCH v2 11/11 atstk1002: enable generic board
In reply to Andreas Bießmann---
Changes in v2: None
Changes in v1:
- new since RFC
include/configs/atstk1002.h | 4 ++++ 1 file changed, 4 insertions(+)
include/configs/atstk1002.h +4 -0
@@ -104,6 +104,10 @@#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY +/* generic board */ +#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R /* * Command line configuration.
Signature · 1 line
1.7.10.4