From: Jaehoon Chung Date: Mon, 28 Oct 2024 02:09:49 +0000 (+0900) Subject: configs: Sync the tizen configs with latest configuration X-Git-Tag: accepted/tizen/unified/20241126.175211~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ca8d2a7450bfe310ddf8bbf760df48f6ff2bd79;p=platform%2Fkernel%2Fu-boot.git configs: Sync the tizen configs with latest configuration Sync the tizen configs with latest configurations. device-tree is using the files under dts/upstream/src. Change-Id: I51f868a10b596fae1d3ea8473541c022e95a3402 Signed-off-by: Jaehoon Chung --- diff --git a/configs/tizen-khadas-vim3_defconfig b/configs/tizen-khadas-vim3_defconfig index 09a058ce6f..a7d26e91de 100644 --- a/configs/tizen-khadas-vim3_defconfig +++ b/configs/tizen-khadas-vim3_defconfig @@ -7,7 +7,7 @@ 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_DEFAULT_DEVICE_TREE="amlogic/meson-g12b-a311d-khadas-vim3" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_G12A=y @@ -104,6 +104,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685D 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_VIDEO=y CONFIG_VIDEO_MESON=y diff --git a/configs/tizen-khadas-vim3l_defconfig b/configs/tizen-khadas-vim3l_defconfig index 46facba098..1eb35b84af 100644 --- a/configs/tizen-khadas-vim3l_defconfig +++ b/configs/tizen-khadas-vim3l_defconfig @@ -7,7 +7,7 @@ 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_DEFAULT_DEVICE_TREE="amlogic/meson-sm1-khadas-vim3l" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_G12A=y @@ -103,6 +103,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685D 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_VIDEO=y CONFIG_VIDEO_MESON=y diff --git a/configs/tizen-odroid-c4_defconfig b/configs/tizen-odroid-c4_defconfig index 5fa15ad85f..1cbfab8265 100644 --- a/configs/tizen-odroid-c4_defconfig +++ b/configs/tizen-odroid-c4_defconfig @@ -7,7 +7,7 @@ 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_DEFAULT_DEVICE_TREE="amlogic/meson-sm1-odroid-c4" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_G12A=y @@ -84,6 +84,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685D 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_VIDEO=y CONFIG_VIDEO_MESON=y diff --git a/configs/tizen-odroid-n2_defconfig b/configs/tizen-odroid-n2_defconfig index a77854d16e..ab0943e539 100644 --- a/configs/tizen-odroid-n2_defconfig +++ b/configs/tizen-odroid-n2_defconfig @@ -7,7 +7,7 @@ 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_DEFAULT_DEVICE_TREE="amlogic/meson-g12b-odroid-n2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_G12A=y @@ -83,6 +83,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x685D 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_VIDEO=y CONFIG_VIDEO_MESON=y diff --git a/configs/tizen_qemu-riscv64_smode_defconfig b/configs/tizen_qemu-riscv64_smode_defconfig index 1a7da7912d..44335a6b38 100644 --- a/configs/tizen_qemu-riscv64_smode_defconfig +++ b/configs/tizen_qemu-riscv64_smode_defconfig @@ -1,24 +1,26 @@ CONFIG_RISCV=y CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_ENV_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="qemu-virt64" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x80200000 CONFIG_TARGET_QEMU_VIRT=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_FIT=y +CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="part number ${devtype} ${devnum} ${bootname} bootpart; load ${devtype} ${devnum}:${bootpart} ${scriptaddr} ${prefix}${script}; distro_bootpart=${bootpart}; source ${scriptaddr}" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr}; test -n \"${loadbootenv}\" -a -n \"${importbootenv}\" && run loadbootenv && run importbootenv;" -CONFIG_DISPLAY_CPUINFO=y -CONFIG_DISPLAY_BOARDINFO=y CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 -CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_TFTPPUT=y # CONFIG_CMD_MII is not set @@ -27,5 +29,3 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="1:3" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y CONFIG_SYS_MAX_FLASH_BANKS=2 -CONFIG_DM_RESET=y -CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/tizen_rpi_4_32b_defconfig b/configs/tizen_rpi_4_32b_defconfig index 0a107f458f..34edabd55b 100644 --- a/configs/tizen_rpi_4_32b_defconfig +++ b/configs/tizen_rpi_4_32b_defconfig @@ -12,8 +12,9 @@ CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_PCI=y -CONFIG_OF_BOARD_SETUP=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_FDT_SIMPLEFB=y CONFIG_USE_PREBOOT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_STDIO_DEREGISTER=y @@ -21,7 +22,6 @@ CONFIG_SYS_STDIO_DEREGISTER=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y -CONFIG_FDT_SIMPLEFB=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_ASKENV=y @@ -71,7 +71,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04E8 CONFIG_USB_GADGET_PRODUCT_NUM=0x685D CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_USB_FUNCTION_THOR=y CONFIG_VIDEO=y CONFIG_PHYS_TO_BUS=y CONFIG_FS_BTRFS=y diff --git a/configs/tizen_rpi_4_defconfig b/configs/tizen_rpi_4_defconfig index 0a11011bbf..4cd2936ae1 100644 --- a/configs/tizen_rpi_4_defconfig +++ b/configs/tizen_rpi_4_defconfig @@ -1,19 +1,18 @@ CONFIG_ARM=y -CONFIG_ARCH_BCM283X=y CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_BCM283X=y 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_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SYS_LOAD_ADDR=0x1000000 CONFIG_PCI=y -CONFIG_OF_BOARD_SETUP=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_FDT_SIMPLEFB=y CONFIG_USE_PREBOOT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_STDIO_DEREGISTER=y @@ -21,7 +20,6 @@ CONFIG_SYS_STDIO_DEREGISTER=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y -CONFIG_FDT_SIMPLEFB=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_ASKENV=y @@ -72,6 +70,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04E8 CONFIG_USB_GADGET_PRODUCT_NUM=0x685D CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_USB_FUNCTION_THOR=y CONFIG_VIDEO=y CONFIG_PHYS_TO_BUS=y