From 2b598c2929b4b2549c3cfab590ae4ee5d89aeead Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 20 Jun 2022 17:26:51 +0900 Subject: [PATCH] configs: amlogic: revert to original configuration Revert to original configurations. It's based on v2021.10. Change-Id: I6d5e9d15431ca9000a96a8556e2dcf5bf4aa37fa Signed-off-by: Jaehoon Chung --- configs/khadas-vim3_defconfig | 31 +++++-------------------------- configs/khadas-vim3l_defconfig | 29 +++++------------------------ configs/odroid-c4_defconfig | 29 ++++------------------------- configs/odroid-n2_defconfig | 30 ++++-------------------------- 4 files changed, 18 insertions(+), 101 deletions(-) diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index a686216e17..e8809a8380 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -3,54 +3,37 @@ CONFIG_SYS_BOARD="vim3" CONFIG_ARCH_MESON=y CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3" CONFIG_MESON_G12A=y -CONFIG_TIZEN_KHADAS_VIM3=y CONFIG_DEBUG_UART_BASE=0xff803000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" khadas-vim3" CONFIG_DEBUG_UART=y 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_PROMPT="Khadas VIM3> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set -CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_ADC=y -CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y # CONFIG_CMD_LOADS is not set -CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y 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_SETEXPR is not set CONFIG_CMD_REGULATOR=y -CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART=":1" -CONFIG_ENV_FAT_FILE="params-vim3.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_ADC=y CONFIG_SARADC_MESON=y CONFIG_BUTTON=y CONFIG_BUTTON_ADC=y -CONFIG_DFU_MMC=y -CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 -CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 -CONFIG_DFU_NAME_MAX_SIZE=34 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MESON=y CONFIG_MMC_MESON_GX=y @@ -71,7 +54,6 @@ CONFIG_MESON_G12A_USB_PHY=y CONFIG_PINCTRL=y CONFIG_PINCTRL_MESON_G12A=y CONFIG_POWER_DOMAIN=y -CONFIG_MESON_GX_VPU_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y @@ -92,13 +74,11 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_MESON_G12A=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Tizen" -CONFIG_USB_GADGET_VENDOR_NUM=0x04E8 -CONFIG_USB_GADGET_PRODUCT_NUM=0x685D +CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada 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 @@ -107,7 +87,6 @@ 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 diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig index a8510b0a5b..8eb52c0f69 100644 --- a/configs/khadas-vim3l_defconfig +++ b/configs/khadas-vim3l_defconfig @@ -3,53 +3,37 @@ CONFIG_SYS_BOARD="vim3" CONFIG_ARCH_MESON=y CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-khadas-vim3l" CONFIG_MESON_G12A=y -CONFIG_TIZEN_KHADAS_VIM3L=y CONFIG_DEBUG_UART_BASE=0xff803000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" khadas-vim3l" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y -CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="run mbr_check; run button_check; run reboot_check" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_MISC_INIT_R=y -CONFIG_SYS_PROMPT="Khadas VIM3L> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set -CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_ADC=y -CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y # CONFIG_CMD_LOADS is not set -CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y 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_SETEXPR is not set CONFIG_CMD_REGULATOR=y -CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART=":1" -CONFIG_ENV_FAT_FILE="params-vim3l.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_ADC=y CONFIG_SARADC_MESON=y CONFIG_BUTTON=y CONFIG_BUTTON_ADC=y -CONFIG_DFU_MMC=y -CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 -CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 -CONFIG_DFU_NAME_MAX_SIZE=34 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MESON=y CONFIG_MMC_MESON_GX=y @@ -90,13 +74,11 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_MESON_G12A=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Tizen" -CONFIG_USB_GADGET_VENDOR_NUM=0x04E8 -CONFIG_USB_GADGET_PRODUCT_NUM=0x685D +CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada 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 @@ -105,7 +87,6 @@ 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 diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig index fb22924d8e..356a9c9be2 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -3,45 +3,29 @@ CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-odroid-c4" CONFIG_MESON_G12A=y -CONFIG_TIZEN_ODROID_C4=y CONFIG_DEBUG_UART_BASE=0xff803000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" odroid-c4/hc4" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set -CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="run mbr_check; run button_check; run reboot_check" -# CONFIG_CONSOLE_MUX is not set CONFIG_MISC_INIT_R=y -CONFIG_SYS_PROMPT="Odroid C4> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set -CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set -CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_BMP=y +# CONFIG_CMD_SETEXPR is not set CONFIG_CMD_REGULATOR=y -CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART=":1" -CONFIG_ENV_FAT_FILE="params-c4.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_BUTTON=y -CONFIG_BUTTON_GPIO=y -CONFIG_DFU_MMC=y CONFIG_ADC=y CONFIG_SARADC_MESON=y CONFIG_MMC_MESON_GX=y @@ -70,13 +54,11 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_MESON_G12A=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Tizen" -CONFIG_USB_GADGET_VENDOR_NUM=0x04E8 -CONFIG_USB_GADGET_PRODUCT_NUM=0x685D +CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada 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 @@ -85,11 +67,8 @@ 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 -CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 -CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig index 3b7fc39703..1f718a3154 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -3,43 +3,29 @@ CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-odroid-n2" CONFIG_MESON_G12A=y -CONFIG_TIZEN_ODROID_N2=y CONFIG_DEBUG_UART_BASE=0xff803000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" odroid-n2/n2-plus" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y # CONFIG_DISPLAY_CPUINFO is not set -CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="run mbr_check; run reboot_check" -# CONFIG_CONSOLE_MUX is not set CONFIG_MISC_INIT_R=y -CONFIG_SYS_PROMPT="Odroid N2> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set -CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set -CONFIG_CMD_MBR=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_BMP=y +# CONFIG_CMD_SETEXPR is not set CONFIG_CMD_REGULATOR=y -CONFIG_CMD_SQUASHFS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_FAT_DEVICE_AND_PART=":1" -CONFIG_ENV_FAT_FILE="params-n2.bin" CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_DFU_MMC=y CONFIG_ADC=y CONFIG_SARADC_MESON=y CONFIG_MMC_MESON_GX=y @@ -53,7 +39,6 @@ CONFIG_MESON_G12A_USB_PHY=y CONFIG_PINCTRL=y CONFIG_PINCTRL_MESON_G12A=y CONFIG_POWER_DOMAIN=y -CONFIG_MESON_GX_VPU_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y @@ -69,26 +54,19 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_MESON_G12A=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Tizen" -CONFIG_USB_GADGET_VENDOR_NUM=0x04E8 -CONFIG_USB_GADGET_PRODUCT_NUM=0x685D +CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada 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 -CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 -CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 -- 2.34.1