From b42d4f33f499b2d853ab2dd2ef1af6da8ac6aae3 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Fri, 28 Jul 2023 10:45:46 +0900 Subject: [PATCH] configs: tizen: Enable TEXT_BASE value in config Enable TEXT_BASE value in config. It's changed from SYS_TEXT_BASE to TEXT_BASE. Change-Id: Id4a679eb2010f6e6180c6622567f2fb53bf93b73 Signed-off-by: Jaehoon Chung --- configs/tizen-khadas-vim3_defconfig | 27 ++++++--------------------- configs/tizen-khadas-vim3l_defconfig | 26 ++++++-------------------- configs/tizen-odroid-c4_defconfig | 25 +++++-------------------- configs/tizen-odroid-n2_defconfig | 25 +++++-------------------- configs/tizen_rpi_4_32b_defconfig | 18 +++++++----------- configs/tizen_rpi_4_defconfig | 19 +++++++------------ 6 files changed, 36 insertions(+), 104 deletions(-) diff --git a/configs/tizen-khadas-vim3_defconfig b/configs/tizen-khadas-vim3_defconfig index aa4e7fcb27..f2f6a7bf3b 100644 --- a/configs/tizen-khadas-vim3_defconfig +++ b/configs/tizen-khadas-vim3_defconfig @@ -1,12 +1,16 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3" CONFIG_SYS_PROMPT="Khadas VIM3> " +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_MESON_G12A=y CONFIG_TIZEN_KHADAS_VIM3=y CONFIG_DEBUG_UART_BASE=0xff803000 @@ -14,13 +18,11 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" khadas-vim3" CONFIG_SYS_MEM_TOP_HIDE=0x08000000 CONFIG_SYS_LOAD_ADDR=0x1000000 +CONFIG_PCI=y CONFIG_DEBUG_UART=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run mbr_check; run button_check; run reboot_check" -# CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 @@ -39,7 +41,6 @@ CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_BMP=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y @@ -69,7 +70,6 @@ CONFIG_DM_MDIO_MUX=y CONFIG_ETH_DESIGNWARE_MESON8B=y CONFIG_MDIO_MUX_MESON_G12A=y CONFIG_NVME=y -CONFIG_PCI=y CONFIG_PCIE_DW_MESON=y CONFIG_MESON_G12A_USB_PHY=y CONFIG_PINCTRL=y @@ -79,7 +79,6 @@ CONFIG_MESON_GX_VPU_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_RESET=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y @@ -103,17 +102,3 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y -CONFIG_DM_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_MESON=y -CONFIG_VIDEO_DT_SIMPLEFB=y -CONFIG_SPLASH_SCREEN=y -CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_SPLASH_SOURCE=y -CONFIG_VIDEO_BMP_RLE8=y -CONFIG_BMP_16BPP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/tizen-khadas-vim3l_defconfig b/configs/tizen-khadas-vim3l_defconfig index 3a1270f00e..cb3ef7c87d 100644 --- a/configs/tizen-khadas-vim3l_defconfig +++ b/configs/tizen-khadas-vim3l_defconfig @@ -1,12 +1,16 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-khadas-vim3l" CONFIG_SYS_PROMPT="Khadas VIM3L> " +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_MESON_G12A=y CONFIG_TIZEN_KHADAS_VIM3L=y CONFIG_DEBUG_UART_BASE=0xff803000 @@ -14,9 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" khadas-vim3l" CONFIG_SYS_MEM_TOP_HIDE=0x08000000 CONFIG_SYS_LOAD_ADDR=0x1000000 +CONFIG_PCI=y CONFIG_DEBUG_UART=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run mbr_check; run button_check; run reboot_check" @@ -38,7 +41,6 @@ CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_BMP=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y @@ -68,7 +70,6 @@ CONFIG_DM_MDIO_MUX=y CONFIG_ETH_DESIGNWARE_MESON8B=y CONFIG_MDIO_MUX_MESON_G12A=y CONFIG_NVME=y -CONFIG_PCI=y CONFIG_PCIE_DW_MESON=y CONFIG_MESON_G12A_USB_PHY=y CONFIG_PINCTRL=y @@ -77,7 +78,6 @@ CONFIG_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_RESET=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y @@ -101,17 +101,3 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y -CONFIG_DM_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_MESON=y -CONFIG_VIDEO_DT_SIMPLEFB=y -CONFIG_SPLASH_SCREEN=y -CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_SPLASH_SOURCE=y -CONFIG_VIDEO_BMP_RLE8=y -CONFIG_BMP_16BPP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/tizen-odroid-c4_defconfig b/configs/tizen-odroid-c4_defconfig index 24929d123f..39d2e31b91 100644 --- a/configs/tizen-odroid-c4_defconfig +++ b/configs/tizen-odroid-c4_defconfig @@ -1,12 +1,16 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-odroid-c4" CONFIG_SYS_PROMPT="Odroid C4> " +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_MESON_G12A=y CONFIG_TIZEN_ODROID_C4=y CONFIG_DEBUG_UART_BASE=0xff803000 @@ -15,12 +19,9 @@ CONFIG_IDENT_STRING=" odroid-c4/hc4" CONFIG_SYS_MEM_TOP_HIDE=0x08000000 CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DEBUG_UART=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run mbr_check; run button_check; run reboot_check" -# CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 @@ -34,7 +35,6 @@ CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_BMP=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y @@ -64,7 +64,6 @@ CONFIG_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_RESET=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y @@ -83,17 +82,3 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y -CONFIG_DM_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_MESON=y -CONFIG_VIDEO_DT_SIMPLEFB=y -CONFIG_SPLASH_SCREEN=y -CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_SPLASH_SOURCE=y -CONFIG_VIDEO_BMP_RLE8=y -CONFIG_BMP_16BPP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/tizen-odroid-n2_defconfig b/configs/tizen-odroid-n2_defconfig index deb1583793..223c1ec301 100644 --- a/configs/tizen-odroid-n2_defconfig +++ b/configs/tizen-odroid-n2_defconfig @@ -1,12 +1,16 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-odroid-n2" CONFIG_SYS_PROMPT="Odroid N2> " +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_MESON_G12A=y CONFIG_TIZEN_ODROID_N2=y CONFIG_DEBUG_UART_BASE=0xff803000 @@ -15,12 +19,9 @@ CONFIG_IDENT_STRING=" odroid-n2/n2-plus" CONFIG_SYS_MEM_TOP_HIDE=0x08000000 CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_DEBUG_UART=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_OF_BOARD_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run mbr_check; run reboot_check" -# CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y CONFIG_SYS_MAXARGS=32 @@ -34,7 +35,6 @@ CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_BMP=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y @@ -63,7 +63,6 @@ CONFIG_MESON_GX_VPU_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_RESET=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y @@ -82,17 +81,3 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y -CONFIG_DM_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_MESON=y -CONFIG_VIDEO_DT_SIMPLEFB=y -CONFIG_SPLASH_SCREEN=y -CONFIG_SPLASH_SCREEN_ALIGN=y -CONFIG_SPLASH_SOURCE=y -CONFIG_VIDEO_BMP_RLE8=y -CONFIG_BMP_16BPP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/tizen_rpi_4_32b_defconfig b/configs/tizen_rpi_4_32b_defconfig index 7546d21b12..84a71a002e 100644 --- a/configs/tizen_rpi_4_32b_defconfig +++ b/configs/tizen_rpi_4_32b_defconfig @@ -1,17 +1,20 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_RPI_4_32B=y CONFIG_TIZEN_RPI4=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 +CONFIG_PCI=y CONFIG_OF_BOARD_SETUP=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_PREBOOT=y CONFIG_SYS_STDIO_DEREGISTER=y # CONFIG_DISPLAY_CPUINFO is not set @@ -49,7 +52,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_BCMGENET=y -CONFIG_PCI=y CONFIG_PCI_BRCMSTB=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set @@ -70,13 +72,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685D CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y -CONFIG_DM_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_FS_BTRFS=y CONFIG_ADDR_MAP=y CONFIG_SYS_NUM_ADDR_MAP=2 -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/tizen_rpi_4_defconfig b/configs/tizen_rpi_4_defconfig index 371d8721e4..e81c800485 100644 --- a/configs/tizen_rpi_4_defconfig +++ b/configs/tizen_rpi_4_defconfig @@ -1,17 +1,20 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_TEXT_BASE=0x00080000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_RPI_4=y CONFIG_TIZEN_RPI4=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7fffee0 +CONFIG_PCI=y CONFIG_OF_BOARD_SETUP=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_PREBOOT=y CONFIG_SYS_STDIO_DEREGISTER=y # CONFIG_DISPLAY_CPUINFO is not set @@ -49,7 +52,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_BCM2835=y CONFIG_BCMGENET=y -CONFIG_PCI=y CONFIG_PCI_BRCMSTB=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set @@ -70,11 +72,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685D CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y -CONFIG_DM_VIDEO=y -# CONFIG_VIDEO_BPP8 is not set -# CONFIG_VIDEO_BPP16 is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_CONSOLE_SCROLL_LINES=10 -CONFIG_VIDEO_DT_SIMPLEFB=y CONFIG_PHYS_TO_BUS=y -CONFIG_OF_LIBFDT_OVERLAY=y -- 2.34.1