From 60a4dccb0effe1101c6dd545bdc85b6da5cee433 Mon Sep 17 00:00:00 2001 From: d4n1 Date: Wed, 22 Dec 2021 18:02:46 +0500 Subject: [PATCH] fix: various build time errors --- arch/arm/mach-exynos/Kconfig | 26 +++++++++++------------- board/samsung/axy17lte/Kconfig | 2 +- board/samsung/beyond/Kconfig | 4 ++-- board/samsung/beyond/Makefile | 4 ---- configs/beyond1lte_defconfig | 5 ++++- drivers/pinctrl/exynos/pinctrl-exynos9.c | 2 +- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 870b3b2006..48fade183c 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -45,6 +45,16 @@ config ARCH_EXYNOS7 Cortex-A53 CPU (and some in a big.LITTLE configuration). There are multiple SoCs in this family including Exynos7420. +config ARCH_EXYNOS9 + bool "Exynos9 SoC family" + select ARM64 + select BLK + select DM_MMC + help + Samsung Exynos9 SoC family are based on ARM Cortex-A77 CPU, + Cortex-A73 CPU, Cortex-A55 CPU, Cortex-A53 CPU or Custom Mongoose CPU. + There are multiple SoCs in this family including Exynos8995 and Exynos9820. + endchoice if ARCH_EXYNOS4 @@ -181,25 +191,13 @@ config TARGET_A3Y17LTE endchoice endif -config ARCH_EXYNOS9 - bool "Exynos9 SoC family" - select ARM64 - select BLK - select DM_MMC - help - Samsung Exynos9 SoC family are based on ARM Cortex-A77 CPU, - Cortex-A73 CPU, Cortex-A55 CPU, Cortex-A53 CPU or Custom Mongoose CPU. - There are multiple SoCs in this family including Exynos8995 and Exynos9820. - -endchoice - if ARCH_EXYNOS9 choice prompt "EXYNOS9 board select" -config TARGET_DREAM - bool "DREAM board" +config TARGET_BEYOND + bool "BEYOND board" select ARM64 select ARMV8_MULTIENTRY select CLK_EXYNOS diff --git a/board/samsung/axy17lte/Kconfig b/board/samsung/axy17lte/Kconfig index 2abf8e7acf..d6e3783a11 100644 --- a/board/samsung/axy17lte/Kconfig +++ b/board/samsung/axy17lte/Kconfig @@ -1,6 +1,6 @@ config SYS_CONFIG_NAME string "Board configuration name" - default "exynos78x0-common.h" + default "exynos78x0-common" help This option contains information about board configuration name. Based on this option include/configs/.h header diff --git a/board/samsung/beyond/Kconfig b/board/samsung/beyond/Kconfig index c05bc19e78..29a7e3d606 100644 --- a/board/samsung/beyond/Kconfig +++ b/board/samsung/beyond/Kconfig @@ -1,7 +1,7 @@ if TARGET_BEYOND config SYS_BOARD - default "BEYOND" + default "beyond" help BEYOND is a production board for Galaxy S10/S10e/S10+ phones on Exynos9820 SoC. @@ -15,4 +15,4 @@ config EXYNOS9820 bool "Exynos 9820 SOC support" default "y" -endif \ No newline at end of file +endif diff --git a/board/samsung/beyond/Makefile b/board/samsung/beyond/Makefile index 76ab7500f3..d14494cc16 100644 --- a/board/samsung/beyond/Makefile +++ b/board/samsung/beyond/Makefile @@ -5,8 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifndef CONFIG_SPL_BUILD -obj-y += exynos9820.o -endif - obj-$(CONFIG_TARGET_BEYOND) += beyond.o \ No newline at end of file diff --git a/configs/beyond1lte_defconfig b/configs/beyond1lte_defconfig index 9aa4de5121..29457872f1 100644 --- a/configs/beyond1lte_defconfig +++ b/configs/beyond1lte_defconfig @@ -10,4 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=n CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_DISPLAY_CPUINFO=n CONFIG_STANDALONE_LOAD_ADDR=0x10008000 -CONFIG_SYS_MALLOC_F_LEN=0x8000 \ No newline at end of file +CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_POSITION_INDEPENDENT=y +CONFIG_SYS_LOAD_ADDR=0x81ad7fff +CONFIG_PSCI_RESET=n \ No newline at end of file diff --git a/drivers/pinctrl/exynos/pinctrl-exynos9.c b/drivers/pinctrl/exynos/pinctrl-exynos9.c index 989551341d..82afbe181e 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos9.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos9.c @@ -57,7 +57,7 @@ U_BOOT_DRIVER(pinctrl_exynos9) = { .name = "pinctrl_exynos9", .id = UCLASS_PINCTRL, .of_match = exynos9_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct exynos_pinctrl_priv), + .priv_auto = sizeof(struct exynos_pinctrl_priv), .ops = &exynos9_pinctrl_ops, .probe = exynos_pinctrl_probe, }; \ No newline at end of file