| Message ID | 20240408181429.3676856-13-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3308: Sync DT with linux v6.8 and update defconfigs | expand |
On 2024/4/9 02:14, Jonas Karlman wrote: > Update defconfig for rk3308-roc-cc with new defaults. > > Add OF_LIBFDT_OVERLAY=y to support device tree overlays. > > Remove the SPL_DRIVERS_MISC=y option, no misc driver is used in SPL. > > Remove BOOTDELAY=0, SYS_CONSOLE_INFO_QUIET=y and enable more CMD to > allow use of U-Boot cmdline. > > Add DM_ETH_PHY=y and PHY_REALTEK=y to support onboard ethernet PHY. > > Add PHY_ROCKCHIP_INNO_USB2=y, DM_USB_GADGET=y and remove USB_DWC2=y to > allow full use of USB 2.0 host and otg ports. > > Enable EFI_LOADER to allow EFI boot. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: No change > --- > configs/roc-cc-rk3308_defconfig | 35 +++++++++++++-------------------- > 1 file changed, 14 insertions(+), 21 deletions(-) > > diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig > index 041fa75b9659..ef58bd657532 100644 > --- a/configs/roc-cc-rk3308_defconfig > +++ b/configs/roc-cc-rk3308_defconfig > @@ -4,9 +4,9 @@ CONFIG_COUNTER_FREQUENCY=24000000 > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SPL_GPIO=y > CONFIG_DEFAULT_DEVICE_TREE="rk3308-roc-cc" > +CONFIG_OF_LIBFDT_OVERLAY=y > CONFIG_DM_RESET=y > CONFIG_ROCKCHIP_RK3308=y > -CONFIG_SPL_DRIVERS_MISC=y > CONFIG_TARGET_ROC_RK3308_CC=y > CONFIG_DEBUG_UART_BASE=0xFF0C0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > @@ -15,30 +15,20 @@ CONFIG_DEBUG_UART=y > CONFIG_ANDROID_BOOT_IMAGE=y > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > -CONFIG_BOOTDELAY=0 > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-roc-cc.dtb" > -CONFIG_SYS_CONSOLE_INFO_QUIET=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_MAX_SIZE=0x20000 > +CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > -# CONFIG_CMD_BDI is not set > -# CONFIG_CMD_CONSOLE is not set > -# CONFIG_CMD_ELF is not set > -# CONFIG_CMD_IMI is not set > -# CONFIG_CMD_XIMG is not set > +CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=y > -# CONFIG_CMD_LOADB is not set > -# CONFIG_CMD_LOADS is not set > CONFIG_CMD_MMC=y > CONFIG_CMD_USB=y > +CONFIG_CMD_ROCKUSB=y > CONFIG_CMD_USB_MASS_STORAGE=y > -# CONFIG_CMD_ITEST is not set > -# CONFIG_CMD_SETEXPR is not set > -# CONFIG_CMD_SLEEP is not set > -# CONFIG_SPL_DOS_PARTITION is not set > -# CONFIG_ISO_PARTITION is not set > -CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 > +CONFIG_CMD_RNG=y > +CONFIG_CMD_KASLRSEED=y > +CONFIG_CMD_REGULATOR=y > CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_LIVE=y > CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > @@ -52,27 +42,30 @@ CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_SUPPORT_EMMC_RPMB=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DM_ETH_PHY=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > -CONFIG_PHY=y > +CONFIG_PHY_ROCKCHIP_INNO_USB2=y > CONFIG_PINCTRL=y > CONFIG_REGULATOR_PWM=y > CONFIG_DM_REGULATOR_FIXED=y > CONFIG_SPL_DM_REGULATOR_FIXED=y > +CONFIG_DM_REGULATOR_GPIO=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > CONFIG_SYS_NS16550_MEM32=y > +CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_SPL_TINY_MEMSET=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_LZO=y > CONFIG_ERRNO_STR=y > -# CONFIG_EFI_LOADER is not set
diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig index 041fa75b9659..ef58bd657532 100644 --- a/configs/roc-cc-rk3308_defconfig +++ b/configs/roc-cc-rk3308_defconfig @@ -4,9 +4,9 @@ CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y CONFIG_SPL_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="rk3308-roc-cc" +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3308=y -CONFIG_SPL_DRIVERS_MISC=y CONFIG_TARGET_ROC_RK3308_CC=y CONFIG_DEBUG_UART_BASE=0xFF0C0000 CONFIG_DEBUG_UART_CLOCK=24000000 @@ -15,30 +15,20 @@ CONFIG_DEBUG_UART=y CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -CONFIG_BOOTDELAY=0 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-roc-cc.dtb" -CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set -CONFIG_SPL_MAX_SIZE=0x20000 +CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -# CONFIG_CMD_BDI is not set -# CONFIG_CMD_CONSOLE is not set -# CONFIG_CMD_ELF is not set -# CONFIG_CMD_IMI is not set -# CONFIG_CMD_XIMG is not set +CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_ROCKUSB=y CONFIG_CMD_USB_MASS_STORAGE=y -# CONFIG_CMD_ITEST is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_SLEEP is not set -# CONFIG_SPL_DOS_PARTITION is not set -# CONFIG_ISO_PARTITION is not set -CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 +CONFIG_CMD_RNG=y +CONFIG_CMD_KASLRSEED=y +CONFIG_CMD_REGULATOR=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" @@ -52,27 +42,30 @@ CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y -CONFIG_PHY=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_SPL_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y +CONFIG_SYSINFO=y CONFIG_SYSRESET=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_SPL_TINY_MEMSET=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_LZO=y CONFIG_ERRNO_STR=y -# CONFIG_EFI_LOADER is not set
Update defconfig for rk3308-roc-cc with new defaults. Add OF_LIBFDT_OVERLAY=y to support device tree overlays. Remove the SPL_DRIVERS_MISC=y option, no misc driver is used in SPL. Remove BOOTDELAY=0, SYS_CONSOLE_INFO_QUIET=y and enable more CMD to allow use of U-Boot cmdline. Add DM_ETH_PHY=y and PHY_REALTEK=y to support onboard ethernet PHY. Add PHY_ROCKCHIP_INNO_USB2=y, DM_USB_GADGET=y and remove USB_DWC2=y to allow full use of USB 2.0 host and otg ports. Enable EFI_LOADER to allow EFI boot. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: No change --- configs/roc-cc-rk3308_defconfig | 35 +++++++++++++-------------------- 1 file changed, 14 insertions(+), 21 deletions(-)