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 <jh80.chung@samsung.com>

diff --git a/configs/tizen-khadas-vim3_defconfig b/configs/tizen-khadas-vim3_defconfig
index 09a058ce6fd594d5b5ebd8e9aa6a53d84de3f8e6..a7d26e91de912e1070d7bf2b842d898c26e48ec3 100644 (file)
--- 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 46facba0986c2221be7221d5694985b95308df2a..1eb35b84af12efca25fb33c1cd05ba13f80f5e56 100644 (file)
--- 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 5fa15ad85f85546c6457d41ce3b0f39b94933f1f..1cbfab8265f072a794537d51e8fdbeef380c45a6 100644 (file)
--- 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 a77854d16e229324c9b906014453dabced605967..ab0943e5397b891bd492e5b6cb7a387d62fda777 100644 (file)
--- 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 1a7da7912d5412af96885f5ac5100f149cdbf15a..44335a6b38678885ad93fe5852c32dfda4fc8a81 100644 (file)
--- 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 0a107f458f9e3ccc54fe8dfc5ff216db603a0562..34edabd55b72065857cd6bd92dbd190c6d1a6a74 100644 (file)
--- 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 0a11011bbfec7d28cd40b4056797a7dfcd44b1af..4cd2936ae14a0468f0096ab96e646a4192c9e899 100644 (file)
--- 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