diff options
author | Tom Rini <trini@konsulko.com> | 2024-03-13 18:47:16 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-03-13 18:47:16 -0400 |
commit | 3987e15e88a1d6a9a211b7637728fcc0acf74fbe (patch) | |
tree | 5259b77db728b368c4900579c2d44337ae6de9e7 /board | |
parent | 213ffd49bdbd30512661eaf47b7445ef8a81bcdb (diff) | |
parent | 969ea37dfd04e2800828fe2a26cd354d22569d18 (diff) | |
download | u-boot-WIP/13Mar2024-next.zip u-boot-WIP/13Mar2024-next.tar.gz u-boot-WIP/13Mar2024-next.tar.bz2 |
Merge branch '2024-04-13-assorted-fixes' into nextWIP/13Mar2024-next
- Fix bootm_low handling, CONFIG_64BIT usage fixes, RNG fixes, cli
history fixes, allow bootelf to pass a device tree address, other
assorted fixes.
Diffstat (limited to 'board')
48 files changed, 21 insertions, 326 deletions
diff --git a/board/anbernic/rgxx3_rk3566/Kconfig b/board/anbernic/rgxx3_rk3566/Kconfig index 6743a28..b5ee67c 100644 --- a/board/anbernic/rgxx3_rk3566/Kconfig +++ b/board/anbernic/rgxx3_rk3566/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "anbernic-rgxx3-rk3566" -config BOARD_SPECIFIC_OPTIONS - def_bool y - endif diff --git a/board/chipspark/popmetal_rk3288/Kconfig b/board/chipspark/popmetal_rk3288/Kconfig index a5f4043..22228ae 100644 --- a/board/chipspark/popmetal_rk3288/Kconfig +++ b/board/chipspark/popmetal_rk3288/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "popmetal_rk3288" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/edgeble/neural-compute-module-6/Kconfig b/board/edgeble/neural-compute-module-6/Kconfig index c445454..05de14f 100644 --- a/board/edgeble/neural-compute-module-6/Kconfig +++ b/board/edgeble/neural-compute-module-6/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "neural-compute-module-6" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/elgin/elgin_rv1108/Kconfig b/board/elgin/elgin_rv1108/Kconfig index be92431..e942e13 100644 --- a/board/elgin/elgin_rv1108/Kconfig +++ b/board/elgin/elgin_rv1108/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "elgin_rv1108" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/firefly/firefly-rk3288/Kconfig b/board/firefly/firefly-rk3288/Kconfig index 1c2bca8..ed1c9fc 100644 --- a/board/firefly/firefly-rk3288/Kconfig +++ b/board/firefly/firefly-rk3288/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "firefly-rk3288" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/firefly/firefly-rk3308/Kconfig b/board/firefly/firefly-rk3308/Kconfig index 80b1ad8..fd6b981 100644 --- a/board/firefly/firefly-rk3308/Kconfig +++ b/board/firefly/firefly-rk3308/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "firefly_rk3308" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/firefly/roc-pc-rk3399/Kconfig b/board/firefly/roc-pc-rk3399/Kconfig index 720fbbb..c211e9d 100644 --- a/board/firefly/roc-pc-rk3399/Kconfig +++ b/board/firefly/roc-pc-rk3399/Kconfig @@ -9,8 +9,5 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "roc-pc-rk3399" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/friendlyelec/nanopc-t6-rk3588/Kconfig b/board/friendlyelec/nanopc-t6-rk3588/Kconfig index 032ef48..e86a94c 100644 --- a/board/friendlyelec/nanopc-t6-rk3588/Kconfig +++ b/board/friendlyelec/nanopc-t6-rk3588/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "nanopc-t6-rk3588" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/geekbuying/geekbox/Kconfig b/board/geekbuying/geekbox/Kconfig index 41aa8fb..ac5aedf 100644 --- a/board/geekbuying/geekbox/Kconfig +++ b/board/geekbuying/geekbox/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "geekbox" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/google/gru/Kconfig b/board/google/gru/Kconfig index 1455e14..c84ebaf 100644 --- a/board/google/gru/Kconfig +++ b/board/google/gru/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gru" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif if TARGET_CHROMEBOOK_KEVIN @@ -25,7 +22,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gru" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/google/veyron/Kconfig b/board/google/veyron/Kconfig index 7f55d78..e24a2ae 100644 --- a/board/google/veyron/Kconfig +++ b/board/google/veyron/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "veyron" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif if TARGET_CHROMEBIT_MICKEY @@ -25,9 +22,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "veyron" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif if TARGET_CHROMEBOOK_MINNIE @@ -41,9 +35,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "veyron" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif if TARGET_CHROMEBOOK_SPEEDY @@ -57,7 +48,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "veyron" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/hardkernel/odroid_go2/Kconfig b/board/hardkernel/odroid_go2/Kconfig index cf3f7c9..82988df 100644 --- a/board/hardkernel/odroid_go2/Kconfig +++ b/board/hardkernel/odroid_go2/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "odroid_go2" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/hardkernel/odroid_m1/Kconfig b/board/hardkernel/odroid_m1/Kconfig index 999c494..0217c91 100644 --- a/board/hardkernel/odroid_m1/Kconfig +++ b/board/hardkernel/odroid_m1/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "odroid_m1" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/mqmaker/miqi_rk3288/Kconfig b/board/mqmaker/miqi_rk3288/Kconfig index 232a112..bb687c9 100644 --- a/board/mqmaker/miqi_rk3288/Kconfig +++ b/board/mqmaker/miqi_rk3288/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "miqi_rk3288" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/phytec/phycore_rk3288/Kconfig b/board/phytec/phycore_rk3288/Kconfig index 57cd8e2..09753ef 100644 --- a/board/phytec/phycore_rk3288/Kconfig +++ b/board/phytec/phycore_rk3288/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "phycore_rk3288" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/pine64/pinebook-pro-rk3399/Kconfig b/board/pine64/pinebook-pro-rk3399/Kconfig index 3bb7ca4..3eedbcd 100644 --- a/board/pine64/pinebook-pro-rk3399/Kconfig +++ b/board/pine64/pinebook-pro-rk3399/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "pinebook-pro-rk3399" -config BOARD_SPECIFIC_OPTIONS - def_bool y - endif diff --git a/board/pine64/pinephone-pro-rk3399/Kconfig b/board/pine64/pinephone-pro-rk3399/Kconfig index 13d6465..5f207df 100644 --- a/board/pine64/pinephone-pro-rk3399/Kconfig +++ b/board/pine64/pinephone-pro-rk3399/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "pinephone-pro-rk3399" -config BOARD_SPECIFIC_OPTIONS - def_bool y - endif diff --git a/board/pine64/quartz64_rk3566/Kconfig b/board/pine64/quartz64_rk3566/Kconfig index 3de1d8f..104b7a1 100644 --- a/board/pine64/quartz64_rk3566/Kconfig +++ b/board/pine64/quartz64_rk3566/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "quartz64_rk3566" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/pine64/quartzpro64-rk3588/Kconfig b/board/pine64/quartzpro64-rk3588/Kconfig index 96aa792..4147240 100644 --- a/board/pine64/quartzpro64-rk3588/Kconfig +++ b/board/pine64/quartzpro64-rk3588/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "quartzpro64-rk3588" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/pine64/rockpro64_rk3399/Kconfig b/board/pine64/rockpro64_rk3399/Kconfig index 3353f1f..93aab57 100644 --- a/board/pine64/rockpro64_rk3399/Kconfig +++ b/board/pine64/rockpro64_rk3399/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "rockpro64_rk3399" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/radxa/rock/Kconfig b/board/radxa/rock/Kconfig index 855b9b6..c9c4576 100644 --- a/board/radxa/rock/Kconfig +++ b/board/radxa/rock/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "rock" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/radxa/rock2/Kconfig b/board/radxa/rock2/Kconfig index c2ff9e9..82ecaba 100644 --- a/board/radxa/rock2/Kconfig +++ b/board/radxa/rock2/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "rock2" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/radxa/rock5a-rk3588s/Kconfig b/board/radxa/rock5a-rk3588s/Kconfig index 2d7fc85..82013ad 100644 --- a/board/radxa/rock5a-rk3588s/Kconfig +++ b/board/radxa/rock5a-rk3588s/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "rock5a-rk3588s" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/radxa/rock5b-rk3588/Kconfig b/board/radxa/rock5b-rk3588/Kconfig index 8f14446..41dfe24 100644 --- a/board/radxa/rock5b-rk3588/Kconfig +++ b/board/radxa/rock5b-rk3588/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "rock5b-rk3588" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rikomagic/mk808/Kconfig b/board/rikomagic/mk808/Kconfig index 4abad7e..61c27d2 100644 --- a/board/rikomagic/mk808/Kconfig +++ b/board/rikomagic/mk808/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "mk808" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_px30/Kconfig b/board/rockchip/evb_px30/Kconfig index 0042c8e..03ed808 100644 --- a/board/rockchip/evb_px30/Kconfig +++ b/board/rockchip/evb_px30/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_px30" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_px5/Kconfig b/board/rockchip/evb_px5/Kconfig index 9a04ee7..7a42b4a 100644 --- a/board/rockchip/evb_px5/Kconfig +++ b/board/rockchip/evb_px5/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_px5" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3036/Kconfig b/board/rockchip/evb_rk3036/Kconfig index ef45f62..4abe8cf 100644 --- a/board/rockchip/evb_rk3036/Kconfig +++ b/board/rockchip/evb_rk3036/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3036" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3128/Kconfig b/board/rockchip/evb_rk3128/Kconfig index 5b3095a..c36691c 100644 --- a/board/rockchip/evb_rk3128/Kconfig +++ b/board/rockchip/evb_rk3128/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3128" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3229/Kconfig b/board/rockchip/evb_rk3229/Kconfig index 361dcb1..f5862d5 100644 --- a/board/rockchip/evb_rk3229/Kconfig +++ b/board/rockchip/evb_rk3229/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3229" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3288/Kconfig b/board/rockchip/evb_rk3288/Kconfig index 8ab07f4..0707486 100644 --- a/board/rockchip/evb_rk3288/Kconfig +++ b/board/rockchip/evb_rk3288/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3288" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3308/Kconfig b/board/rockchip/evb_rk3308/Kconfig index 0074429..b12d7f8 100644 --- a/board/rockchip/evb_rk3308/Kconfig +++ b/board/rockchip/evb_rk3308/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3308" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3328/Kconfig b/board/rockchip/evb_rk3328/Kconfig index ef446b4..1e084bd 100644 --- a/board/rockchip/evb_rk3328/Kconfig +++ b/board/rockchip/evb_rk3328/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3328" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3399/Kconfig b/board/rockchip/evb_rk3399/Kconfig index 412b81c..597b0a6 100644 --- a/board/rockchip/evb_rk3399/Kconfig +++ b/board/rockchip/evb_rk3399/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3399" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3568/Kconfig b/board/rockchip/evb_rk3568/Kconfig index f3d3a7e..ab710c5 100644 --- a/board/rockchip/evb_rk3568/Kconfig +++ b/board/rockchip/evb_rk3568/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3568" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rk3588/Kconfig b/board/rockchip/evb_rk3588/Kconfig index d38efe6..5e15d2e 100644 --- a/board/rockchip/evb_rk3588/Kconfig +++ b/board/rockchip/evb_rk3588/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rk3588" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/evb_rv1108/Kconfig b/board/rockchip/evb_rv1108/Kconfig index 4a76e0b..91afefd 100644 --- a/board/rockchip/evb_rv1108/Kconfig +++ b/board/rockchip/evb_rv1108/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "evb_rv1108" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/kylin_rk3036/Kconfig b/board/rockchip/kylin_rk3036/Kconfig index 8d35b4e..debffe1 100644 --- a/board/rockchip/kylin_rk3036/Kconfig +++ b/board/rockchip/kylin_rk3036/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kylin_rk3036" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/sheep_rk3368/Kconfig b/board/rockchip/sheep_rk3368/Kconfig index d39b5e8..321bf81 100644 --- a/board/rockchip/sheep_rk3368/Kconfig +++ b/board/rockchip/sheep_rk3368/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "sheep_rk3368" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/rockchip/tinker_rk3288/Kconfig b/board/rockchip/tinker_rk3288/Kconfig index bca6c37..04a9f14 100644 --- a/board/rockchip/tinker_rk3288/Kconfig +++ b/board/rockchip/tinker_rk3288/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "tinker_rk3288" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c index ac4415f..062e4a7 100644 --- a/board/socionext/developerbox/developerbox.c +++ b/board/socionext/developerbox/developerbox.c @@ -125,10 +125,29 @@ int dram_init(void) struct draminfo *synquacer_draminfo = (void *)SQ_DRAMINFO_BASE; struct draminfo_entry *ent = synquacer_draminfo->entry; unsigned long size = 0; - int i; + struct mm_region *mr; + int i, ri; + + if (synquacer_draminfo->nr_regions < 1) { + log_err("Failed to get correct DRAM information\n"); + return -EINVAL; + } - for (i = 0; i < synquacer_draminfo->nr_regions; i++) + for (i = 0; i < synquacer_draminfo->nr_regions; i++) { + if (i >= MAX_DDR_REGIONS) + break; + + ri = DDR_REGION_INDEX(i); + mem_map[ri].phys = ent[i].base; + mem_map[ri].size = ent[i].size; + mem_map[ri].virt = mem_map[ri].phys; size += ent[i].size; + if (i == 0) + continue; + + mr = &mem_map[DDR_REGION_INDEX(0)]; + mem_map[ri].attrs = mr->attrs; + } gd->ram_size = size; gd->ram_base = ent[0].base; @@ -162,43 +181,6 @@ int dram_init_banksize(void) return 0; } -void build_mem_map(void) -{ - struct draminfo *synquacer_draminfo = (void *)SQ_DRAMINFO_BASE; - struct draminfo_entry *ent = synquacer_draminfo->entry; - struct mm_region *mr; - int i, ri; - - if (synquacer_draminfo->nr_regions < 1) { - log_err("Failed to get correct DRAM information\n"); - return; - } - - /* Update memory region maps */ - for (i = 0; i < synquacer_draminfo->nr_regions; i++) { - if (i >= MAX_DDR_REGIONS) - break; - - ri = DDR_REGION_INDEX(i); - mem_map[ri].phys = ent[i].base; - mem_map[ri].size = ent[i].size; - mem_map[ri].virt = mem_map[ri].phys; - if (i == 0) - continue; - - mr = &mem_map[DDR_REGION_INDEX(0)]; - mem_map[ri].attrs = mr->attrs; - } -} - -void enable_caches(void) -{ - build_mem_map(); - - icache_enable(); - dcache_enable(); -} - int print_cpuinfo(void) { printf("CPU: SC2A11:Cortex-A53 MPCore 24cores\n"); diff --git a/board/st/stv0991/Kconfig b/board/st/stv0991/Kconfig deleted file mode 100644 index 007712f..0000000 --- a/board/st/stv0991/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_STV0991 - -config SYS_BOARD - default "stv0991" - -config SYS_VENDOR - default "st" - -config SYS_SOC - default "stv0991" - -config SYS_CONFIG_NAME - default "stv0991" - -endif diff --git a/board/st/stv0991/MAINTAINERS b/board/st/stv0991/MAINTAINERS deleted file mode 100644 index e7a2cca..0000000 --- a/board/st/stv0991/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -STV0991 APPLICATION BOARD -M: Vikas Manocha <vikas.manocha@st.com> -S: Maintained -F: board/st/stv0991/ -F: include/configs/stv0991.h -F: configs/stv0991_defconfig diff --git a/board/st/stv0991/Makefile b/board/st/stv0991/Makefile deleted file mode 100644 index 7f6d719..0000000 --- a/board/st/stv0991/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2014, STMicroelectronics - All Rights Reserved -# Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. - -obj-y := stv0991.o diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c deleted file mode 100644 index 57ca9f6..0000000 --- a/board/st/stv0991/stv0991.c +++ /dev/null @@ -1,119 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2014, STMicroelectronics - All Rights Reserved - * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. - */ - -#include <common.h> -#include <bootstage.h> -#include <dm.h> -#include <init.h> -#include <miiphy.h> -#include <net.h> -#include <asm/arch/stv0991_periph.h> -#include <asm/arch/stv0991_defs.h> -#include <asm/arch/hardware.h> -#include <asm/arch/gpio.h> -#include <netdev.h> -#include <asm/global_data.h> -#include <asm/io.h> -#include <dm/platform_data/serial_pl01x.h> - -DECLARE_GLOBAL_DATA_PTR; - -struct gpio_regs *const gpioa_regs = - (struct gpio_regs *) GPIOA_BASE_ADDR; - -#ifndef CONFIG_OF_CONTROL -static const struct pl01x_serial_plat serial_plat = { - .base = 0x80406000, - .type = TYPE_PL011, - .clock = 2700 * 1000, -}; - -U_BOOT_DRVINFO(stv09911_serials) = { - .name = "serial_pl01x", - .plat = &serial_plat, -}; -#endif - -#if CONFIG_IS_ENABLED(BOOTSTAGE) -void show_boot_progress(int progress) -{ - printf("%i\n", progress); -} -#endif - -void enable_eth_phy(void) -{ - /* Set GPIOA_06 pad HIGH (Appli board)*/ - writel(readl(&gpioa_regs->dir) | 0x40, &gpioa_regs->dir); - writel(readl(&gpioa_regs->data) | 0x40, &gpioa_regs->data); -} -int board_eth_enable(void) -{ - stv0991_pinmux_config(ETH_GPIOB_10_31_C_0_4); - clock_setup(ETH_CLOCK_CFG); - enable_eth_phy(); - return 0; -} - -int board_qspi_enable(void) -{ - stv0991_pinmux_config(QSPI_CS_CLK_PAD); - clock_setup(QSPI_CLOCK_CFG); - return 0; -} - -/* - * Miscellaneous platform dependent initialisations - */ -int board_init(void) -{ - board_eth_enable(); - board_qspi_enable(); - return 0; -} - -int board_uart_init(void) -{ - stv0991_pinmux_config(UART_GPIOC_30_31); - clock_setup(UART_CLOCK_CFG); - return 0; -} - -#ifdef CONFIG_BOARD_EARLY_INIT_F -int board_early_init_f(void) -{ - board_uart_init(); - return 0; -} -#endif - -int dram_init(void) -{ - gd->ram_size = PHYS_SDRAM_1_SIZE; - return 0; -} - -int dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - - return 0; -} - -#ifdef CONFIG_CMD_NET -int board_eth_init(struct bd_info *bis) -{ - int ret = 0; - -#if defined(CONFIG_ETH_DESIGNWARE) - u32 interface = PHY_INTERFACE_MODE_MII; - if (designware_initialize(GMAC_BASE_ADDR, interface) >= 0) - ret++; -#endif - return ret; -} -#endif diff --git a/board/theobroma-systems/lion_rk3368/Kconfig b/board/theobroma-systems/lion_rk3368/Kconfig index fddbf82..537a2e7 100644 --- a/board/theobroma-systems/lion_rk3368/Kconfig +++ b/board/theobroma-systems/lion_rk3368/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lion_rk3368" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - config ENV_SIZE default 0x2000 diff --git a/board/turing/turing-rk1-rk3588/Kconfig b/board/turing/turing-rk1-rk3588/Kconfig index 4c6cd6a..0def6e0 100644 --- a/board/turing/turing-rk1-rk3588/Kconfig +++ b/board/turing/turing-rk1-rk3588/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "turing-rk1-rk3588" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif diff --git a/board/vamrs/rock960_rk3399/Kconfig b/board/vamrs/rock960_rk3399/Kconfig index cacc53f..0c052c6 100644 --- a/board/vamrs/rock960_rk3399/Kconfig +++ b/board/vamrs/rock960_rk3399/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "rock960_rk3399" -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - endif |