ppc4xx: Add SPL support
PATCH 1/3 ppc4xx: Add SPL support
This patch adds SPL booting support (NOR flash) for the PPC4xx platforms.
This SPL booting (Falcon mode) will be used by the upcoming lcd4_lwmon5 board port (lwmon5 variant).
--- arch/powerpc/cpu/ppc4xx/Makefile | 4 ++ arch/powerpc/cpu/ppc4xx/start.S | 37 +++++++++++++++-- arch/powerpc/cpu/ppc4xx/u-boot-spl.lds | 74 ++++++++++++++++++++++++++++++++++ arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 + 4 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/cpu/ppc4xx/u-boot-spl.lds
arch/powerpc/cpu/ppc4xx/Makefile +4 -0
@@ -68,6 +68,10 @@ COBJS += miiphy.o COBJS += uic.o endif +ifdef CONFIG_SPL_BUILD +COBJS-y += spl_boot.o +endif + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS-y)) START := $(addprefix $(obj),$(START))
arch/powerpc/cpu/ppc4xx/start.S +33 -4
@@ -232,7 +232,7 @@ * * Use r12 to access the GOT */ -#if !defined(CONFIG_NAND_SPL) +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(_FIXUP_TABLE_)
@@ -248,7 +248,8 @@ END_GOT #endif /* CONFIG_NAND_SPL */ -#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) +#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) && \ + !defined(CONFIG_SPL_BUILD) /* * NAND U-Boot image is started from offset 0 */
@@ -270,6 +271,18 @@ bl _start_440 #endif +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + /* + * This is the entry of the real U-Boot from a board port + * that supports SPL booting on the PPC4xx. We only need + * to call board_init_f() here. Everything else has already + * been done in the SPL u-boot version. + */ + GET_GOT /* initialize GOT access */ + bl board_init_f /* run 1st part of board init code (in Flash)*/ + /* NOTREACHED - board_init_f() does not return */ +#endif + /* * 440 Startup -- on reset only the top 4k of the effective * address space is mapped in by an entry in the instruction
@@ -539,7 +552,7 @@ tlbnx2: addi r4,r4,1 /* Next TLB */ * r3 - 1st arg to board_init(): IMMP pointer * r4 - 2nd arg to board_init(): boot flag */ -#ifndef CONFIG_NAND_SPL +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) .text .long 0x27051956 /* U-Boot Magic Number */ .globl version_string
@@ -612,6 +625,18 @@ _end_of_vectors: .globl _start _start: +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + /* + * This is the entry of the real U-Boot from a board port + * that supports SPL booting on the PPC4xx. We only need + * to call board_init_f() here. Everything else has already + * been done in the SPL u-boot version. + */ + GET_GOT /* initialize GOT access */ + bl board_init_f /* run 1st part of board init code (in Flash)*/ + /* NOTREACHED - board_init_f() does not return */ +#endif + /*****************************************************************************/ #if defined(CONFIG_440)
@@ -796,7 +821,9 @@ _start: #ifdef CONFIG_NAND_SPL bl nand_boot_common /* will not return */ #else +#ifndef CONFIG_SPL_BUILD GET_GOT +#endif bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl board_init_f
@@ -1080,7 +1107,7 @@ _start: /*----------------------------------------------------------------------- */ -#ifndef CONFIG_NAND_SPL +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) /* * This code finishes saving the registers to the exception frame * and jumps to the appropriate handler for the exception.
@@ -1262,6 +1289,7 @@ in32r: lwbrx r3,r0,r3 blr +#if !defined(CONFIG_SPL_BUILD) /* * void relocate_code (addr_sp, gd, addr_moni) *
@@ -1626,6 +1654,7 @@ __440_msr_continue: mtlr r4 /* restore link register */ blr +#endif /* CONFIG_SPL_BUILD */ #if defined(CONFIG_440) /*----------------------------------------------------------------------------+
arch/powerpc/cpu/ppc4xx/u-boot-spl.lds new file +74 -0
74 lines not on this page · raw message
arch/powerpc/cpu/ppc4xx/u-boot.lds +2 -0
@@ -96,6 +96,7 @@ SECTIONS . = ALIGN(256); __init_end = .; +#ifndef CONFIG_SPL #ifdef CONFIG_440 .bootpg RESET_VECTOR_ADDRESS - 0xffc : {
@@ -132,6 +133,7 @@ SECTIONS #if (RESET_VECTOR_ADDRESS == 0xfffffffc) . |= 0x10; #endif +#endif /* CONFIG_SPL */ __bss_start = .; .bss (NOLOAD) :
Signature · 1 line
1.8.1.4
PATCH 2/3 Makefile: Add target for combined u-boot.img & spl/u-boot.bin
This new make target "u-boot-img-spl-at-end.bin" consists of the the real, full-blown U-Boot image and the U-Boot SPL binary directly attached to it. The full-blown U-Boot image has the mkimage header included, with its load-address and entry-point.
This will be used by the upcoming lwmon5 PPC440EPx derivate board port.
--- Makefile | 12 ++++++++++++ config.mk | 4 ++++ 2 files changed, 16 insertions(+)
Makefile +12 -0
@@ -548,6 +548,18 @@ endif $(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img cat $(obj)spl/u-boot-spl.bin $(obj)u-boot.img > $@ +# PPC4xx needs the SPL at the end of the image, since the reset vector +# is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target +# and need to introduce a new build target with the full blown U-Boot +# at the start padded up to the start of the SPL image. And then concat +# the SPL image to the end. +$(obj)u-boot-img-spl-at-end.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img + tr "\000" "\377" < /dev/zero | dd ibs=1 count=$(CONFIG_UBOOT_PAD_TO) \ + of=$(obj)u-boot-pad.img 2>/dev/null + dd if=$(obj)u-boot.img of=$(obj)u-boot-pad.img \ + conv=notrunc 2>/dev/null + cat $(obj)u-boot-pad.img $(obj)spl/u-boot-spl.bin > $@ + ifeq ($(CONFIG_SANDBOX),y) GEN_UBOOT = \ cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
config.mk +4 -0
@@ -217,6 +217,10 @@ ifneq ($(CONFIG_SPL_PAD_TO),) CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO) endif +ifneq ($(CONFIG_UBOOT_PAD_TO),) +CPPFLAGS += -DCONFIG_UBOOT_PAD_TO=$(CONFIG_UBOOT_PAD_TO) +endif + ifeq ($(CONFIG_SPL_BUILD),y) CPPFLAGS += -DCONFIG_SPL_BUILD endif
Signature · 1 line
1.8.1.4
PATCH 2/3 Makefile: Add target for combined u-boot.img & spl/u-boot.bin
Quoted 9 lines · Stefan Roese
This new make target "u-boot-img-spl-at-end.bin" consists of the the real, full-blown U-Boot image and the U-Boot SPL binary directly attached to it. The full-blown U-Boot image has the mkimage header included, with its load-address and entry-point.
This will be used by the upcoming lwmon5 PPC440EPx derivate board port.
Signed-off-by Stefan Roese <[email protected]>
Applied to u-boot-ppc4xx/master.
Thanks,
Stefan
PATCH 3/3 ppc4xx: Add lcd4_lwmon5 support
In reply to Stefan RoeseThis patch adds the fast booting LWMON5 derivat "lcd4_lwmon5". Its a stripped down version of the full blown lwmon5 support, without ECC, USB, POST and some other stuff. It used the newly introduced SPL infrastrucure for SPL from NOR flash booting on the PPC4xx.
By setting the environment variable "boot_os" to "yes", Linux will be started from the SPL version. If not, the "normal" U-Boot will be started.
--- board/lwmon5/lwmon5.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-- board/lwmon5/sdram.c | 4 ++- boards.cfg | 1 + include/configs/lwmon5.h | 68 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 147 insertions(+), 6 deletions(-)
board/lwmon5/lwmon5.c +78 -2
@@ -1,5 +1,5 @@/* -* (C) Copyright 2007-2010 +* (C) Copyright 2007-2013 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * This program is free software; you can redistribute it and/or
@@ -200,9 +200,11 @@ int misc_init_r(void)u32 pbcr;int size_val =0 ;u32 reg; +#ifndef CONFIG_LCD4_LWMON5 unsigned long usb2d0cr =0 ;unsigned long usb2phy0cr, usb2h0cr =0 ;unsigned long sdr0_pfc1, sdr0_srst; +#endif /* * FLASH stuff...
@@ -233,6 +235,7 @@ int misc_init_r(void)CONFIG_ENV_ADDR_REDUND +2 *CONFIG_ENV_SECT_SIZE -1 , &flash_info[cfi_flash_num_flash_banks - 1]); +#ifndef CONFIG_LCD4_LWMON5 /* * USB suff... */
@@ -306,6 +309,7 @@ int misc_init_r(void)/* 7. Reassert internal PHY reset: */ mtsdr (SDR0_SRST1 ,SDR0_SRST1_USB20PHY );udelay (1000 ); +#endif /* * Clear resets
@@ -313,7 +317,9 @@ int misc_init_r(void)mtsdr (SDR0_SRST1 ,0x00000000 );mtsdr (SDR0_SRST0 ,0x00000000 ); +#ifndef CONFIG_LCD4_LWMON5 printf ("USB: Host(int phy) Device(ext phy)\n" ); +#endif /* * Clear PLB4A0_ACR[WRP]
@@ -323,10 +329,12 @@ int misc_init_r(void) reg =mfdcr (PLB4A0_ACR ) & ~PLB4Ax_ACR_WRP_MASK;mtdcr (PLB4A0_ACR , reg); +#ifndef CONFIG_LCD4_LWMON5 /* * Init matrix keyboard */ misc_init_r_kbd (); +#endif return 0 ; }
@@ -336,7 +344,7 @@ int checkboard(void)char buf[64 ];int i =getenv_f ("serial#" , buf,sizeof (buf)); -puts ("Board: lwmon5" ); +printf ("Board: %s" ,__stringify (CONFIG_HOSTNAME ));if (i >0 ) {puts (", serial# " );
@@ -495,3 +503,71 @@ void board_reset(void) {gpio_write_bit (CONFIG_SYS_GPIO_BOARD_RESET ,1 ); } + +#ifdef CONFIG_SPL_OS_BOOT +/* +* lwmon5 specific implementation of spl_start_uboot() +* +* RETURN +* 0 if booting into OS is selected (default) +* 1 if booting into U-Boot is selected +*/ +int spl_start_uboot (void ) +{ +char s[8 ]; + +env_init (); +getenv_f ("boot_os" , s,sizeof (s)); +if ((s !=NULL ) && (strcmp (s,"yes" ) ==0 )) +return 0 ; + +return 1 ; +} + +/* +* This function is called from the SPL U-Boot version for +* early init stuff, that needs to be done for OS (e.g. Linux) +* booting. Doing it later in the real U-Boot would not work +* in case that the SPL U-Boot boots Linux directly. +*/ +void spl_board_init (void ) +{ +const gdc_regs *regs =board_get_regs (); + +/* +* Reset PHY's: +* The PHY's need a 2nd reset pulse, since the MDIO address is latched +* upon reset, and with the first reset upon powerup, the addresses are +* not latched reliable, since the IRQ line is multiplexed with an +* MDIO address. A 2nd reset at this time will make sure, that the +* correct address is latched. +*/ +gpio_write_bit (CONFIG_SYS_GPIO_PHY0_RST ,1 ); +gpio_write_bit (CONFIG_SYS_GPIO_PHY1_RST ,1 ); +udelay (1000 ); +gpio_write_bit (CONFIG_SYS_GPIO_PHY0_RST ,0 ); +gpio_write_bit (CONFIG_SYS_GPIO_PHY1_RST ,0 ); +udelay (1000 ); +gpio_write_bit (CONFIG_SYS_GPIO_PHY0_RST ,1 ); +gpio_write_bit (CONFIG_SYS_GPIO_PHY1_RST ,1 ); + +/* +* Reset Lime controller +*/ +gpio_write_bit (CONFIG_SYS_GPIO_LIME_S ,1 ); +udelay (500 ); +gpio_write_bit (CONFIG_SYS_GPIO_LIME_RST ,1 ); + +out_be32 ((void *)CONFIG_SYS_LIME_SDRAM_CLOCK , CONFIG_SYS_MB862xx_CCF); +udelay (300 ); +out_be32 ((void *)CONFIG_SYS_LIME_MMR , CONFIG_SYS_MB862xx_MMR); + +while (regs->index) { +out_be32 ((void *)(CONFIG_SYS_LIME_BASE_0 +GC_DISP_BASE ) + + regs->index, regs->value); + regs++; + } + +board_backlight_brightness (DEFAULT_BRIGHTNESS ); +} +#endif
board/lwmon5/sdram.c +3 -1
@@ -6,7 +6,7 @@* Alain Saurel, AMCC/IBM, alain.saurel at fr.ibm.com * Robert Snyder, AMCC/IBM, rob.snyder at fr.ibm.com * -* (C) Copyright 2007-2008 +* (C) Copyright 2007-2013 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * This program is free software; you can redistribute it and/or
@@ -160,6 +160,7 @@ static void program_ecc(u32 start_address,************************************************************************/ phys_size_t initdram (int board_type) { +#if defined(CONFIG_SPL_BUILD ) || !defined(CONFIG_LCD4_LWMON5 )/* CL=4 */ mtsdram (DDR0_02 ,0x00000000 );
@@ -253,6 +254,7 @@ phys_size_t initdram (int board_type)* exceptions are enabled. */ set_mcsr (get_mcsr ()); +#endif /* CONFIG_SPL_BUILD */ return (CONFIG_SYS_MBYTES_SDRAM <<20 ); }
boards.cfg +1 -0
@@ -972,6 +972,7 @@ JSE powerpc ppc4xx jse korat powerpc ppc4xx korat_perm powerpc ppc4xx korat - - korat:KORAT_PERMANENT lwmon5 powerpc ppc4xx +lcd4_lwmon5 powerpc ppc4xx lwmon5 - - lwmon5:LCD4_LWMON5 pcs440ep powerpc ppc4xx quad100hd powerpc ppc4xx sbc405 powerpc ppc4xx
include/configs/lwmon5.h +65 -3
156 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH v2 3/3 ppc4xx: Add lcd4_lwmon5 support
This patch adds the fast booting LWMON5 derivat "lcd4_lwmon5". Its a stripped down version of the full blown lwmon5 support, without ECC, USB, POST and some other stuff. It used the newly introduced SPL infrastrucure for SPL from NOR flash booting on the PPC4xx.
By setting the environment variable "boot_os" to "yes", Linux will be started from the SPL version. If not, the "normal" U-Boot will be started.
---
v2:
- Call board_init_f() from spl_board_init(). This initializes the PFC registers needed for example for working ethernet in Linux.
board/lwmon5/lwmon5.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- board/lwmon5/sdram.c | 4 ++- boards.cfg | 1 + include/configs/lwmon5.h | 68 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 136 insertions(+), 6 deletions(-)
board/lwmon5/lwmon5.c +67 -2
@@ -1,5 +1,5 @@/* -* (C) Copyright 2007-2010 +* (C) Copyright 2007-2013 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * This program is free software; you can redistribute it and/or
@@ -200,9 +200,11 @@ int misc_init_r(void)u32 pbcr;int size_val =0 ;u32 reg; +#ifndef CONFIG_LCD4_LWMON5 unsigned long usb2d0cr =0 ;unsigned long usb2phy0cr, usb2h0cr =0 ;unsigned long sdr0_pfc1, sdr0_srst; +#endif /* * FLASH stuff...
@@ -233,6 +235,7 @@ int misc_init_r(void)CONFIG_ENV_ADDR_REDUND +2 *CONFIG_ENV_SECT_SIZE -1 , &flash_info[cfi_flash_num_flash_banks - 1]); +#ifndef CONFIG_LCD4_LWMON5 /* * USB suff... */
@@ -306,6 +309,7 @@ int misc_init_r(void)/* 7. Reassert internal PHY reset: */ mtsdr (SDR0_SRST1 ,SDR0_SRST1_USB20PHY );udelay (1000 ); +#endif /* * Clear resets
@@ -313,7 +317,9 @@ int misc_init_r(void)mtsdr (SDR0_SRST1 ,0x00000000 );mtsdr (SDR0_SRST0 ,0x00000000 ); +#ifndef CONFIG_LCD4_LWMON5 printf ("USB: Host(int phy) Device(ext phy)\n" ); +#endif /* * Clear PLB4A0_ACR[WRP]
@@ -323,10 +329,12 @@ int misc_init_r(void) reg =mfdcr (PLB4A0_ACR ) & ~PLB4Ax_ACR_WRP_MASK;mtdcr (PLB4A0_ACR , reg); +#ifndef CONFIG_LCD4_LWMON5 /* * Init matrix keyboard */ misc_init_r_kbd (); +#endif return 0 ; }
@@ -336,7 +344,7 @@ int checkboard(void)char buf[64 ];int i =getenv_f ("serial#" , buf,sizeof (buf)); -puts ("Board: lwmon5" ); +printf ("Board: %s" ,__stringify (CONFIG_HOSTNAME ));if (i >0 ) {puts (", serial# " );
@@ -495,3 +503,60 @@ void board_reset(void) {gpio_write_bit (CONFIG_SYS_GPIO_BOARD_RESET ,1 ); } + +#ifdef CONFIG_SPL_OS_BOOT +/* +* lwmon5 specific implementation of spl_start_uboot() +* +* RETURN +* 0 if booting into OS is selected (default) +* 1 if booting into U-Boot is selected +*/ +int spl_start_uboot (void ) +{ +char s[8 ]; + +env_init (); +getenv_f ("boot_os" , s,sizeof (s)); +if ((s !=NULL ) && (strcmp (s,"yes" ) ==0 )) +return 0 ; + +return 1 ; +} + +/* +* This function is called from the SPL U-Boot version for +* early init stuff, that needs to be done for OS (e.g. Linux) +* booting. Doing it later in the real U-Boot would not work +* in case that the SPL U-Boot boots Linux directly. +*/ +void spl_board_init (void ) +{ +const gdc_regs *regs =board_get_regs (); + +/* +* Setup PFC registers, mainly for ethernet support +* later on in Linux +*/ +board_early_init_f (); + +/* +* Reset Lime controller +*/ +gpio_write_bit (CONFIG_SYS_GPIO_LIME_S ,1 ); +udelay (500 ); +gpio_write_bit (CONFIG_SYS_GPIO_LIME_RST ,1 ); + +out_be32 ((void *)CONFIG_SYS_LIME_SDRAM_CLOCK , CONFIG_SYS_MB862xx_CCF); +udelay (300 ); +out_be32 ((void *)CONFIG_SYS_LIME_MMR , CONFIG_SYS_MB862xx_MMR); + +while (regs->index) { +out_be32 ((void *)(CONFIG_SYS_LIME_BASE_0 +GC_DISP_BASE ) + + regs->index, regs->value); + regs++; + } + +board_backlight_brightness (DEFAULT_BRIGHTNESS ); +} +#endif
board/lwmon5/sdram.c +3 -1
@@ -6,7 +6,7 @@* Alain Saurel, AMCC/IBM, alain.saurel at fr.ibm.com * Robert Snyder, AMCC/IBM, rob.snyder at fr.ibm.com * -* (C) Copyright 2007-2008 +* (C) Copyright 2007-2013 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * This program is free software; you can redistribute it and/or
@@ -160,6 +160,7 @@ static void program_ecc(u32 start_address,************************************************************************/ phys_size_t initdram (int board_type) { +#if defined(CONFIG_SPL_BUILD ) || !defined(CONFIG_LCD4_LWMON5 )/* CL=4 */ mtsdram (DDR0_02 ,0x00000000 );
@@ -253,6 +254,7 @@ phys_size_t initdram (int board_type)* exceptions are enabled. */ set_mcsr (get_mcsr ()); +#endif /* CONFIG_SPL_BUILD */ return (CONFIG_SYS_MBYTES_SDRAM <<20 ); }
boards.cfg +1 -0
@@ -972,6 +972,7 @@ JSE powerpc ppc4xx jse korat powerpc ppc4xx korat_perm powerpc ppc4xx korat - - korat:KORAT_PERMANENT lwmon5 powerpc ppc4xx +lcd4_lwmon5 powerpc ppc4xx lwmon5 - - lwmon5:LCD4_LWMON5 pcs440ep powerpc ppc4xx quad100hd powerpc ppc4xx sbc405 powerpc ppc4xx
include/configs/lwmon5.h +65 -3
156 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH v3 3/3 ppc4xx: Add lcd4_lwmon5 support
This patch adds the fast booting LWMON5 derivat "lcd4_lwmon5". Its a stripped down version of the full blown lwmon5 support, without ECC, USB, POST and some other stuff. It used the newly introduced SPL infrastrucure for SPL from NOR flash booting on the PPC4xx.
By setting the environment variable "boot_os" to "yes", Linux will be started from the SPL version. If not, the "normal" U-Boot will be started.
---
v3:
- Clear all soft-reset bits in the SRSTn registers in SPL. Otherwise Linux will generate an floating point exception as the FPU is still disabled.
v2:
- Call board_init_f() from spl_board_init(). This initializes the PFC registers needed for example for working ethernet in Linux.
board/lwmon5/lwmon5.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++-- board/lwmon5/sdram.c | 4 ++- boards.cfg | 1 + include/configs/lwmon5.h | 68 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 142 insertions(+), 6 deletions(-)
board/lwmon5/lwmon5.c +73 -2
@@ -1,5 +1,5 @@/* -* (C) Copyright 2007-2010 +* (C) Copyright 2007-2013 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * This program is free software; you can redistribute it and/or
@@ -200,9 +200,11 @@ int misc_init_r(void)u32 pbcr;int size_val =0 ;u32 reg; +#ifndef CONFIG_LCD4_LWMON5 unsigned long usb2d0cr =0 ;unsigned long usb2phy0cr, usb2h0cr =0 ;unsigned long sdr0_pfc1, sdr0_srst; +#endif /* * FLASH stuff...
@@ -233,6 +235,7 @@ int misc_init_r(void)CONFIG_ENV_ADDR_REDUND +2 *CONFIG_ENV_SECT_SIZE -1 , &flash_info[cfi_flash_num_flash_banks - 1]); +#ifndef CONFIG_LCD4_LWMON5 /* * USB suff... */
@@ -306,6 +309,7 @@ int misc_init_r(void)/* 7. Reassert internal PHY reset: */ mtsdr (SDR0_SRST1 ,SDR0_SRST1_USB20PHY );udelay (1000 ); +#endif /* * Clear resets
@@ -313,7 +317,9 @@ int misc_init_r(void)mtsdr (SDR0_SRST1 ,0x00000000 );mtsdr (SDR0_SRST0 ,0x00000000 ); +#ifndef CONFIG_LCD4_LWMON5 printf ("USB: Host(int phy) Device(ext phy)\n" ); +#endif /* * Clear PLB4A0_ACR[WRP]
@@ -323,10 +329,12 @@ int misc_init_r(void) reg =mfdcr (PLB4A0_ACR ) & ~PLB4Ax_ACR_WRP_MASK;mtdcr (PLB4A0_ACR , reg); +#ifndef CONFIG_LCD4_LWMON5 /* * Init matrix keyboard */ misc_init_r_kbd (); +#endif return 0 ; }
@@ -336,7 +344,7 @@ int checkboard(void)char buf[64 ];int i =getenv_f ("serial#" , buf,sizeof (buf)); -puts ("Board: lwmon5" ); +printf ("Board: %s" ,__stringify (CONFIG_HOSTNAME ));if (i >0 ) {puts (", serial# " );
@@ -495,3 +503,66 @@ void board_reset(void) {gpio_write_bit (CONFIG_SYS_GPIO_BOARD_RESET ,1 ); } + +#ifdef CONFIG_SPL_OS_BOOT +/* +* lwmon5 specific implementation of spl_start_uboot() +* +* RETURN +* 0 if booting into OS is selected (default) +* 1 if booting into U-Boot is selected +*/ +int spl_start_uboot (void ) +{ +char s[8 ]; + +env_init (); +getenv_f ("boot_os" , s,sizeof (s)); +if ((s !=NULL ) && (strcmp (s,"yes" ) ==0 )) +return 0 ; + +return 1 ; +} + +/* +* This function is called from the SPL U-Boot version for +* early init stuff, that needs to be done for OS (e.g. Linux) +* booting. Doing it later in the real U-Boot would not work +* in case that the SPL U-Boot boots Linux directly. +*/ +void spl_board_init (void ) +{ +const gdc_regs *regs =board_get_regs (); + +/* +* Setup PFC registers, mainly for ethernet support +* later on in Linux +*/ +board_early_init_f (); + +/* +* Clear resets +*/ +mtsdr (SDR0_SRST1 ,0x00000000 ); +mtsdr (SDR0_SRST0 ,0x00000000 ); + +/* +* Reset Lime controller +*/ +gpio_write_bit (CONFIG_SYS_GPIO_LIME_S ,1 ); +udelay (500 ); +gpio_write_bit (CONFIG_SYS_GPIO_LIME_RST ,1 ); + +out_be32 ((void *)CONFIG_SYS_LIME_SDRAM_CLOCK , CONFIG_SYS_MB862xx_CCF); +udelay (300 ); +out_be32 ((void *)CONFIG_SYS_LIME_MMR , CONFIG_SYS_MB862xx_MMR); + +while (regs->index) { +out_be32 ((void *)(CONFIG_SYS_LIME_BASE_0 +GC_DISP_BASE ) + + regs->index, regs->value); + regs++; + } + +board_backlight_brightness (DEFAULT_BRIGHTNESS ); +} +#endif
board/lwmon5/sdram.c +3 -1
@@ -6,7 +6,7 @@* Alain Saurel, AMCC/IBM, alain.saurel at fr.ibm.com * Robert Snyder, AMCC/IBM, rob.snyder at fr.ibm.com * -* (C) Copyright 2007-2008 +* (C) Copyright 2007-2013 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * This program is free software; you can redistribute it and/or
@@ -160,6 +160,7 @@ static void program_ecc(u32 start_address,************************************************************************/ phys_size_t initdram (int board_type) { +#if defined(CONFIG_SPL_BUILD ) || !defined(CONFIG_LCD4_LWMON5 )/* CL=4 */ mtsdram (DDR0_02 ,0x00000000 );
@@ -253,6 +254,7 @@ phys_size_t initdram (int board_type)* exceptions are enabled. */ set_mcsr (get_mcsr ()); +#endif /* CONFIG_SPL_BUILD */ return (CONFIG_SYS_MBYTES_SDRAM <<20 ); }
boards.cfg +1 -0
@@ -972,6 +972,7 @@ JSE powerpc ppc4xx jse korat powerpc ppc4xx korat_perm powerpc ppc4xx korat - - korat:KORAT_PERMANENT lwmon5 powerpc ppc4xx +lcd4_lwmon5 powerpc ppc4xx lwmon5 - - lwmon5:LCD4_LWMON5 pcs440ep powerpc ppc4xx quad100hd powerpc ppc4xx sbc405 powerpc ppc4xx
include/configs/lwmon5.h +65 -3
156 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH v3 3/3 ppc4xx: Add lcd4_lwmon5 support
Quoted 11 lines · Stefan Roese
This patch adds the fast booting LWMON5 derivat "
lcd4_lwmon5". Its a stripped down version of the full blown lwmon5 support, without ECC, USB, POST and some other stuff. It used the newly introduced SPL infrastrucure for SPL from NOR flash booting on the PPC4xx.By setting the environment variable "
boot_os" to "yes", Linux will be started from the SPL version. If not, the "normal" U-Boot will be started.Signed-off-by Stefan Roese <[email protected]>
Applied to u-boot-ppc4xx/master.
Thanks,
Stefan
PATCH 1/3 ppc4xx: Add SPL support
In reply to Stefan RoeseDear Stefan Rose,
Quoted 5 lines · Stefan Roese
arch/powerpc/cpu/ppc4xx/Makefile +0
-0
arch/powerpc/cpu/ppc4xx/Makefile COBJS += miiphy.o · line 77
Quoted 10 lines
arch/powerpc/cpu/ppc4xx/Makefile +4
-0@@ -68,6 +68,10 @@ COBJS += miiphy.o COBJS += uic.o endif +ifdef CONFIG_SPL_BUILD +COBJS-y += spl_boot.o +endif + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS-y)) START := $(addprefix $(obj),$(START))
I think spl_boot.c is missing from this patch series.
All the best,
Rommel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 487 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130330/8766b870/attachment.pgp>
PATCH 1/3 ppc4xx: Add SPL support
Hi Rommel,
Quoted 8 lines · Rommel G Custodio
Quoted 8 lines
arch/powerpc/cpu/ppc4xx/Makefile +0
-0@@ -68,6 +68,10 @@ COBJS += miiphy.o COBJS += uic.o endif
Quoted 9 lines
arch/powerpc/cpu/ppc4xx/Makefile COBJS += miiphy.o · line 77
Quoted 7 lines
arch/powerpc/cpu/ppc4xx/Makefile +4
-0+ifdef CONFIG_SPL_BUILD +COBJS-y += spl_boot.o +endif + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS-y)) START := $(addprefix $(obj),$(START))I think
spl_boot.cis missing from this patch series.
Yes, its missing. I'll resubmit shortly.
Thanks,
Stefan
PATCH v2 1/3 ppc4xx: Add SPL support
In reply to Stefan RoeseThis patch adds SPL booting support (NOR flash) for the PPC4xx platforms.
This SPL booting (Falcon mode) will be used by the upcoming lcd4_lwmon5 board port (lwmon5 variant).
---
v2:
- Add missing spl_boot.c file
arch/powerpc/cpu/ppc4xx/Makefile | 4 ++ arch/powerpc/cpu/ppc4xx/spl_boot.c | 72 +++++++++++++++++++++++++++++++++ arch/powerpc/cpu/ppc4xx/start.S | 37 +++++++++++++++-- arch/powerpc/cpu/ppc4xx/u-boot-spl.lds | 74 ++++++++++++++++++++++++++++++++++ arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 + 5 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/cpu/ppc4xx/spl_boot.c create mode 100644 arch/powerpc/cpu/ppc4xx/u-boot-spl.lds
arch/powerpc/cpu/ppc4xx/Makefile +4 -0
@@ -68,6 +68,10 @@ COBJS += miiphy.o COBJS += uic.o endif +ifdef CONFIG_SPL_BUILD +COBJS-y += spl_boot.o +endif + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS-y)) START := $(addprefix $(obj),$(START))
arch/powerpc/cpu/ppc4xx/spl_boot.c new file +72 -0
72 lines not on this page · raw message
arch/powerpc/cpu/ppc4xx/start.S +33 -4
@@ -232,7 +232,7 @@ * * Use r12 to access the GOT */ -#if !defined(CONFIG_NAND_SPL) +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(_FIXUP_TABLE_)
@@ -248,7 +248,8 @@ END_GOT #endif /* CONFIG_NAND_SPL */ -#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) +#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) && \ + !defined(CONFIG_SPL_BUILD) /* * NAND U-Boot image is started from offset 0 */
@@ -270,6 +271,18 @@ bl _start_440 #endif +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + /* + * This is the entry of the real U-Boot from a board port + * that supports SPL booting on the PPC4xx. We only need + * to call board_init_f() here. Everything else has already + * been done in the SPL u-boot version. + */ + GET_GOT /* initialize GOT access */ + bl board_init_f /* run 1st part of board init code (in Flash)*/ + /* NOTREACHED - board_init_f() does not return */ +#endif + /* * 440 Startup -- on reset only the top 4k of the effective * address space is mapped in by an entry in the instruction
@@ -539,7 +552,7 @@ tlbnx2: addi r4,r4,1 /* Next TLB */ * r3 - 1st arg to board_init(): IMMP pointer * r4 - 2nd arg to board_init(): boot flag */ -#ifndef CONFIG_NAND_SPL +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) .text .long 0x27051956 /* U-Boot Magic Number */ .globl version_string
@@ -612,6 +625,18 @@ _end_of_vectors: .globl _start _start: +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + /* + * This is the entry of the real U-Boot from a board port + * that supports SPL booting on the PPC4xx. We only need + * to call board_init_f() here. Everything else has already + * been done in the SPL u-boot version. + */ + GET_GOT /* initialize GOT access */ + bl board_init_f /* run 1st part of board init code (in Flash)*/ + /* NOTREACHED - board_init_f() does not return */ +#endif + /*****************************************************************************/ #if defined(CONFIG_440)
@@ -796,7 +821,9 @@ _start: #ifdef CONFIG_NAND_SPL bl nand_boot_common /* will not return */ #else +#ifndef CONFIG_SPL_BUILD GET_GOT +#endif bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl board_init_f
@@ -1080,7 +1107,7 @@ _start: /*----------------------------------------------------------------------- */ -#ifndef CONFIG_NAND_SPL +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) /* * This code finishes saving the registers to the exception frame * and jumps to the appropriate handler for the exception.
@@ -1262,6 +1289,7 @@ in32r: lwbrx r3,r0,r3 blr +#if !defined(CONFIG_SPL_BUILD) /* * void relocate_code (addr_sp, gd, addr_moni) *
@@ -1626,6 +1654,7 @@ __440_msr_continue: mtlr r4 /* restore link register */ blr +#endif /* CONFIG_SPL_BUILD */ #if defined(CONFIG_440) /*----------------------------------------------------------------------------+
arch/powerpc/cpu/ppc4xx/u-boot-spl.lds new file +74 -0
74 lines not on this page · raw message
arch/powerpc/cpu/ppc4xx/u-boot.lds +2 -0
@@ -96,6 +96,7 @@ SECTIONS . = ALIGN(256); __init_end = .; +#ifndef CONFIG_SPL #ifdef CONFIG_440 .bootpg RESET_VECTOR_ADDRESS - 0xffc : {
@@ -132,6 +133,7 @@ SECTIONS #if (RESET_VECTOR_ADDRESS == 0xfffffffc) . |= 0x10; #endif +#endif /* CONFIG_SPL */ __bss_start = .; .bss (NOLOAD) :
Signature · 1 line
1.8.2
PATCH v2 1/3 ppc4xx: Add SPL support
Quoted 7 lines · Stefan Roese
This patch adds SPL booting support (NOR flash) for the PPC4xx platforms.
This SPL booting (Falcon mode) will be used by the upcoming
lcd4_lwmon5board port (lwmon5 variant).Signed-off-by Stefan Roese <[email protected]>
Applied to u-boot-ppc4xx/master.
Thanks,
Stefan