[U-Boot] [U-Boot, 14/36] rockchip: rk3036: prepare to use commong board file
Philipp Tomsich
philipp.tomsich at theobroma-systems.com
Sun Apr 1 21:44:57 UTC 2018
On Tue, 27 Mar 2018, Kever Yang wrote:
> Move some soc spec setting into rk3036.c
Please provide a summary of the changes in your commit message.
>
> Signed-off-by: Kever Yang <kever.yang at rock-chips.com>
> ---
>
> arch/arm/mach-rockchip/rk3036-board.c | 104 ---------------------
> arch/arm/mach-rockchip/rk3036/Makefile | 2 +-
> .../{rk3036-board-spl.c => rk3036/rk3036.c} | 41 ++------
> arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 14 +++
> 4 files changed, 24 insertions(+), 137 deletions(-)
> delete mode 100644 arch/arm/mach-rockchip/rk3036-board.c
> rename arch/arm/mach-rockchip/{rk3036-board-spl.c => rk3036/rk3036.c} (50%)
>
> diff --git a/arch/arm/mach-rockchip/rk3036-board.c b/arch/arm/mach-rockchip/rk3036-board.c
> deleted file mode 100644
> index a5d2571..0000000
> --- a/arch/arm/mach-rockchip/rk3036-board.c
> +++ /dev/null
> @@ -1,104 +0,0 @@
> -/*
> - * (C) Copyright 2015 Rockchip Electronics Co., Ltd
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#include <common.h>
> -#include <clk.h>
> -#include <dm.h>
> -#include <ram.h>
> -#include <asm/io.h>
> -#include <asm/arch/clock.h>
> -#include <asm/arch/periph.h>
> -#include <asm/arch/grf_rk3036.h>
> -#include <asm/arch/boot_mode.h>
> -#include <asm/arch/sdram_rk3036.h>
> -#include <asm/gpio.h>
> -#include <dm/pinctrl.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> -__weak int rk_board_late_init(void)
> -{
> - return 0;
> -}
> -
> -int board_late_init(void)
> -{
> - setup_boot_mode();
> -
> - return rk_board_late_init();
> -}
> -
> -int board_init(void)
> -{
> - return 0;
> -}
> -
> -#if !CONFIG_IS_ENABLED(RAM)
> -/*
> - * When CONFIG_RAM is enabled, the dram_init() function is implemented
> - * in sdram_common.c.
> - */
> -int dram_init(void)
> -{
> - gd->ram_size = sdram_size();
> -
> - return 0;
> -}
> -#endif
> -
> -#ifndef CONFIG_SYS_DCACHE_OFF
> -void enable_caches(void)
> -{
> - /* Enable D-cache. I-cache is already enabled in start.S */
> - dcache_enable();
> -}
> -#endif
> -
> -#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG)
> -#include <usb.h>
> -#include <usb/dwc2_udc.h>
> -
> -static struct dwc2_plat_otg_data rk3036_otg_data = {
> - .rx_fifo_sz = 512,
> - .np_tx_fifo_sz = 16,
> - .tx_fifo_sz = 128,
> -};
> -
> -int board_usb_init(int index, enum usb_init_type init)
> -{
> - int node;
> - const char *mode;
> - bool matched = false;
> - const void *blob = gd->fdt_blob;
> -
> - /* find the usb_otg node */
> - node = fdt_node_offset_by_compatible(blob, -1,
> - "rockchip,rk3288-usb");
> -
> - while (node > 0) {
> - mode = fdt_getprop(blob, node, "dr_mode", NULL);
> - if (mode && strcmp(mode, "otg") == 0) {
> - matched = true;
> - break;
> - }
> -
> - node = fdt_node_offset_by_compatible(blob, node,
> - "rockchip,rk3288-usb");
> - }
> - if (!matched) {
> - debug("Not found usb_otg device\n");
> - return -ENODEV;
> - }
> - rk3036_otg_data.regs_otg = fdtdec_get_addr(blob, node, "reg");
> -
> - return dwc2_udc_probe(&rk3036_otg_data);
> -}
> -
> -int board_usb_cleanup(int index, enum usb_init_type init)
> -{
> - return 0;
> -}
> -#endif
> diff --git a/arch/arm/mach-rockchip/rk3036/Makefile b/arch/arm/mach-rockchip/rk3036/Makefile
> index 20d28f7..8a144d1 100644
> --- a/arch/arm/mach-rockchip/rk3036/Makefile
> +++ b/arch/arm/mach-rockchip/rk3036/Makefile
> @@ -4,7 +4,7 @@
> # SPDX-License-Identifier: GPL-2.0+
> #
>
> -obj-y += clk_rk3036.o
> +obj-y += rk3036.o clk_rk3036.o
>
> ifndef CONFIG_SPL_BUILD
> obj-y += syscon_rk3036.o
> diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036/rk3036.c
> similarity index 50%
> rename from arch/arm/mach-rockchip/rk3036-board-spl.c
> rename to arch/arm/mach-rockchip/rk3036/rk3036.c
> index 550e3a1..39cc43b 100644
> --- a/arch/arm/mach-rockchip/rk3036-board-spl.c
> +++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
> @@ -1,28 +1,22 @@
> /*
> - * (C) Copyright 2015 Rockchip Electronics Co., Ltd
> + * Copyright (c) 2017 Rockchip Electronics Co., Ltd
> *
> * SPDX-License-Identifier: GPL-2.0+
> */
> -
> -#include <common.h>
> -#include <debug_uart.h>
> #include <asm/io.h>
> #include <asm/arch/bootrom.h>
> -#include <asm/arch/grf_rk3036.h>
> #include <asm/arch/hardware.h>
> -#include <asm/arch/sdram_rk3036.h>
> -#include <asm/arch/timer.h>
> -#include <asm/arch/uart.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> +#include <asm/arch/grf_rk3036.h>
> #define GRF_BASE 0x20008000
>
> -#define DEBUG_UART_BASE 0x20068000
> -
> -void board_init_f(ulong dummy)
> +#ifdef CONFIG_SPL_BUILD
> +int arch_cpu_init(void)
> +{
> + return 0;
> +}
> +#endif
> +void board_debug_uart_init(void)
> {
> -#ifdef EARLY_DEBUG
> struct rk3036_grf * const grf = (void *)GRF_BASE;
> /*
> * NOTE: sd card and debug uart use same iomux in rk3036,
> @@ -34,22 +28,5 @@ void board_init_f(ulong dummy)
> GPIO1C2_MASK << GPIO1C2_SHIFT,
> GPIO1C3_UART2_SOUT << GPIO1C3_SHIFT |
> GPIO1C2_UART2_SIN << GPIO1C2_SHIFT);
> - debug_uart_init();
> -#endif
> - rockchip_timer_init();
> - sdram_init();
> -
> - /* return to maskrom */
> - back_to_bootrom(BROM_BOOT_NEXTSTAGE);
> -}
>
> -/* Place Holders */
> -void board_init_r(gd_t *id, ulong dest_addr)
> -{
> - /*
> - * Function attribute is no-return
> - * This Function never executes
> - */
> - while (1)
> - ;
> }
> diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
> index ce3f09a..a4fb3ae 100644
> --- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
> +++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
> @@ -11,6 +11,7 @@
> #include <asm/arch/hardware.h>
> #include <asm/arch/sdram_rk3036.h>
> #include <asm/arch/uart.h>
> +DECLARE_GLOBAL_DATA_PTR;
>
> /*
> * we can not fit the code to access the device tree in SPL
> @@ -764,3 +765,16 @@ void sdram_init(void)
> move_to_access_state(&sdram_priv);
> dram_cfg_rbc(&sdram_priv);
> }
> +
> +#if !CONFIG_IS_ENABLED(RAM)
> +/*
> + * When CONFIG_RAM is enabled, the dram_init() function is implemented
> + * in sdram_common.c.
> + */
> +int dram_init(void)
> +{
> + gd->ram_size = sdram_size();
> +
> + return 0;
> +}
> +#endif
>
More information about the U-Boot
mailing list