From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kever Yang Date: Wed, 22 Jul 2020 20:12:47 +0800 Subject: [PATCH v6 2/5] rockchip: roc-rk3399-pc: Add custom led_setup() In-Reply-To: <20200721150604.35410-3-jagan@amarulasolutions.com> References: <20200721150604.35410-1-jagan@amarulasolutions.com> <20200721150604.35410-3-jagan@amarulasolutions.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2020/7/21 ??11:06, Jagan Teki wrote: > roc-rk3399-pc has some specific requirements to support LEDS, > environment. board detection and etc prior to U-Boot proper. > > So as of now SPL would be a better stage for these custom board > requirements to support unlike TPL. Adding few of these custom > requirements like LEDS in TPL would require extra code pulling > and also the size of TPL can grow. > > So, this patch moves the leds code from TPL into SPL Board init > led_setup code. > > Signed-off-by: Jagan Teki I will split the tpl change as a separate patch, otherwise for the code: Reviewed-by: Kever Yang Thanks, - Kever > --- > Changes for v6: > - use spl_board_init custom led function > > arch/arm/mach-rockchip/tpl.c | 7 ------- > board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 10 +++------- > configs/roc-pc-mezzanine-rk3399_defconfig | 2 +- > configs/roc-pc-rk3399_defconfig | 2 +- > 4 files changed, 5 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c > index 88f80b05a9..cc908e1b0e 100644 > --- a/arch/arm/mach-rockchip/tpl.c > +++ b/arch/arm/mach-rockchip/tpl.c > @@ -43,18 +43,11 @@ __weak void rockchip_stimer_init(void) > TIMER_CONTROL_REG); > } > > -__weak int board_early_init_f(void) > -{ > - return 0; > -} > - > void board_init_f(ulong dummy) > { > struct udevice *dev; > int ret; > > - board_early_init_f(); > - > #if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT) > /* > * Debug UART can be used from here if required: > diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c > index 7c3a803654..2b447df8aa 100644 > --- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c > +++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c > @@ -6,7 +6,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -30,19 +29,16 @@ int board_early_init_f(void) > out: > return 0; > } > -#endif > > -#if defined(CONFIG_TPL_BUILD) > +#else > > -#define GPIO0_BASE 0xff720000 > +#define GPIO0_BASE 0xff720000 > > -int board_early_init_f(void) > +void led_setup(void) > { > struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE; > > /* Turn on red LED, indicating full power mode */ > spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1); > - > - return 0; > } > #endif > diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig > index c87a8568fc..15d511741f 100644 > --- a/configs/roc-pc-mezzanine-rk3399_defconfig > +++ b/configs/roc-pc-mezzanine-rk3399_defconfig > @@ -1,6 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_SPL_GPIO_SUPPORT=y > CONFIG_ENV_SIZE=0x8000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_ENV_SECT_SIZE=0x1000 > @@ -21,7 +22,6 @@ CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > CONFIG_SPL_SPI_LOAD=y > CONFIG_TPL=y > -CONFIG_TPL_GPIO_SUPPORT=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig > index 601f5c6ae1..2a6d0d22c8 100644 > --- a/configs/roc-pc-rk3399_defconfig > +++ b/configs/roc-pc-rk3399_defconfig > @@ -1,6 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_SPL_GPIO_SUPPORT=y > CONFIG_ENV_SIZE=0x8000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_ENV_SECT_SIZE=0x1000 > @@ -21,7 +22,6 @@ CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > CONFIG_SPL_SPI_LOAD=y > CONFIG_TPL=y > -CONFIG_TPL_GPIO_SUPPORT=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y