From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 03 May 2023 15:53:43 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1puCvQ-003C15-KK for lore@lore.pengutronix.de; Wed, 03 May 2023 15:53:43 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1puCvN-0001aS-My; Wed, 03 May 2023 15:53:41 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1puCvC-0001J1-Dc; Wed, 03 May 2023 15:53:30 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1puCvB-000qHx-J4; Wed, 03 May 2023 15:53:29 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1puCv9-00HMFW-Qv; Wed, 03 May 2023 15:53:27 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Wed, 3 May 2023 15:53:20 +0200 Message-Id: <20230503135327.4137066-4-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230503135327.4137066-1-a.fatoum@pengutronix.de> References: <20230503135327.4137066-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [DistroKit] =?utf-8?q?=5BPATCH_03/10=5D_v8a=3A_barebox=3A_versio?= =?utf-8?b?biBidW1wIHYyMDIzLjAxLjAg4oaSIHYyMDIzLjA0LjA=?= X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum , mkl@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false As preparation for combining barebox-rockchip and barebox-imx8m, let's update both to v2023.04.0, which is the first release that can target both with the same build. This barebox update also pulls in the kernel DT update that moved around the DT aliases for the Radxa boards. For this reason, we need to touch up the environment as well. Signed-off-by: Ahmad Fatoum --- configs/platform-v8a/barebox-imx8m.config | 122 ++++++------------ .../barebox-rock3a-defaultenv/init/bootsource | 2 +- configs/platform-v8a/barebox-rockchip.config | 36 ++++-- configs/platform-v8a/rules/barebox-imx8m.make | 4 +- .../platform-v8a/rules/barebox-rockchip.make | 4 +- 5 files changed, 71 insertions(+), 97 deletions(-) diff --git a/configs/platform-v8a/barebox-imx8m.config b/configs/platform-v8a/barebox-imx8m.config index d28f47573d68..cfbc624e70fb 100644 --- a/configs/platform-v8a/barebox-imx8m.config +++ b/configs/platform-v8a/barebox-imx8m.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2023.01.0 Configuration +# Barebox/arm 2023.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -10,32 +10,31 @@ CONFIG_TEXT_BASE=0x0 # # System Type # +CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -CONFIG_ARCH_IMX=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set -# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_OMAP_SINGLE is not set # CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_SOCFPGA is not set -# CONFIG_ARCH_S3C24xx is not set -# CONFIG_ARCH_S5PCxx is not set -# CONFIG_ARCH_S3C64xx is not set -# CONFIG_ARCH_STM32MP is not set # CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set -# CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCH_ARM64_VIRT is not set +# CONFIG_ARCH_BCM283X is not set +CONFIG_ARCH_IMX=y +# CONFIG_ARCH_OMAP_MULTI is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_STM32MP is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_ZYNQMP is not set # # Processor Type @@ -49,89 +48,34 @@ CONFIG_CPU_64v8=y # processor features # # CONFIG_BOOT_ENDIANNESS_SWITCH is not set +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y CONFIG_ARCH_IMX_IMXIMAGE=y # -# Freescale i.MX System-on-Chip +# i.MX boards # CONFIG_ARCH_IMX8M=y CONFIG_ARCH_IMX8MM=y CONFIG_ARCH_IMX8MP=y CONFIG_ARCH_IMX8MQ=y -CONFIG_IMX_MULTI_BOARDS=y -# CONFIG_MACH_SCB9328 is not set -# CONFIG_MACH_TX25 is not set -# CONFIG_MACH_PCA100 is not set -# CONFIG_MACH_PCM038 is not set -# CONFIG_MACH_KINDLE_MX50 is not set -# CONFIG_MACH_CCMX51 is not set -# CONFIG_MACH_EFIKA_MX_SMARTBOOK is not set -# CONFIG_MACH_EMBEDSKY_E9 is not set -# CONFIG_MACH_FREESCALE_MX51_PDK is not set -# CONFIG_MACH_CCMX53 is not set -# CONFIG_MACH_FREESCALE_MX53_LOCO is not set -# CONFIG_MACH_GUF_VINCELL is not set -# CONFIG_MACH_TQMA53 is not set -# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set -# CONFIG_MACH_TX53 is not set -# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set -# CONFIG_MACH_PROTONIC_IMX6 is not set -# CONFIG_MACH_PROTONIC_IMX8M is not set + +# +# i.MX8M boards +# # CONFIG_MACH_INNOCOMM_WB15 is not set -# CONFIG_MACH_KONTRON_SAMX6I is not set -# CONFIG_MACH_DFI_FS700_M60 is not set -# CONFIG_MACH_GUF_SANTARO is not set -# CONFIG_MACH_REALQ7 is not set -# CONFIG_MACH_GK802 is not set -# CONFIG_MACH_ELTEC_HIPERCAM is not set -# CONFIG_MACH_TQMA6X is not set -# CONFIG_MACH_TQMA6UL is not set -# CONFIG_MACH_TX6X is not set -# CONFIG_MACH_SABRELITE is not set -# CONFIG_MACH_SABRESD is not set -# CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB is not set -# CONFIG_MACH_NITROGEN6 is not set -# CONFIG_MACH_SOLIDRUN_MICROSOM is not set -# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set -# CONFIG_MACH_TECHNEXION_WANDBOARD is not set -# CONFIG_MACH_EMBEST_MARSBOARD is not set -# CONFIG_MACH_EMBEST_RIOTBOARD is not set -# CONFIG_MACH_UDOO is not set -# CONFIG_MACH_UDOO_NEO is not set -# CONFIG_MACH_VARISCITE_MX6 is not set -# CONFIG_MACH_GW_VENTANA is not set -# CONFIG_MACH_CM_FX6 is not set -# CONFIG_MACH_ADVANTECH_ROM_742X is not set -# CONFIG_MACH_WARP7 is not set -# CONFIG_MACH_AC_SXB is not set -# CONFIG_MACH_MEERKAT96 is not set -# CONFIG_MACH_VF610_TWR is not set -# CONFIG_MACH_ZII_RDU1 is not set -# CONFIG_MACH_ZII_RDU2 is not set -# CONFIG_MACH_ZII_IMX8MQ_DEV is not set -# CONFIG_MACH_ZII_VF610_DEV is not set -# CONFIG_MACH_ZII_IMX7D_DEV is not set -# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set -# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set -# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set -# CONFIG_MACH_NXP_IMX6ULL_EVK is not set +# CONFIG_MACH_MNT_REFORM is not set CONFIG_MACH_NXP_IMX8MM_EVK=y # CONFIG_MACH_NXP_IMX8MN_EVK is not set CONFIG_MACH_NXP_IMX8MP_EVK=y CONFIG_MACH_NXP_IMX8MQ_EVK=y CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y +# CONFIG_MACH_POLYHEX_DEBIX is not set +# CONFIG_MACH_PROTONIC_IMX8M is not set # CONFIG_MACH_TQ_MBA8MPXL is not set -# CONFIG_MACH_GRINN_LITEBOARD is not set -# CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set -# CONFIG_MACH_WEBASTO_CCBV2 is not set -# CONFIG_MACH_MNT_REFORM is not set -# CONFIG_MACH_SKOV_IMX6 is not set - -# -# Board specific settings -# -# end of Board specific settings +# CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP is not set +# CONFIG_MACH_ZII_IMX8MQ_DEV is not set +# end of i.MX boards # # i.MX specific settings @@ -144,6 +88,7 @@ CONFIG_IMX_SAVE_BOOTROM_LOG=y # CONFIG_BOARD_ARM_GENERIC_DT is not set # end of System Type +# CONFIG_32BIT is not set CONFIG_64BIT=y # @@ -271,6 +216,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_REBOOT_MODE=y # CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y @@ -303,8 +249,11 @@ CONFIG_FASTBOOT_SPARSE=y CONFIG_COMPILE_LOGLEVEL=6 CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_LL is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y CONFIG_DEBUG_IMX_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set +# CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set @@ -561,6 +510,8 @@ CONFIG_PHYLIB=y # # CONFIG_DRIVER_NET_BCMGENET is not set # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set +CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y +CONFIG_DRIVER_NET_DESIGNWARE_IMX8=y # CONFIG_DRIVER_NET_ENC28J60 is not set CONFIG_DRIVER_NET_FEC_IMX=y # CONFIG_DRIVER_NET_FSL_FMAN is not set @@ -691,6 +642,7 @@ CONFIG_USB_STORAGE=y # USB Miscellaneous drivers # # CONFIG_USB_HUB_USB251XB is not set +# CONFIG_USB_ONBOARD_HUB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DRIVER_ARC_PBL=y CONFIG_USB_GADGET_DUALSPEED=y @@ -753,7 +705,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # CONFIG_MFD_MC34704 is not set # CONFIG_MFD_MC9SDZ60 is not set # CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set +CONFIG_MFD_SYSCON=y # CONFIG_MFD_TWL4030 is not set # CONFIG_MFD_TWL6030 is not set CONFIG_RAVE_SP_CORE=y @@ -762,6 +714,7 @@ CONFIG_RAVE_SP_CORE=y # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set # CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_ROHM_BD718XX is not set # end of Multifunction device drivers # @@ -858,6 +811,7 @@ CONFIG_RAVE_SP_EEPROM=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED=y # CONFIG_REGULATOR_PFUZE is not set +# CONFIG_REGULATOR_ANATOP is not set # # Remoteproc drivers @@ -892,6 +846,7 @@ CONFIG_RTC_DRV_DS1307=y # # CONFIG_FIRMWARE_ALTERA_SERIAL is not set # CONFIG_ARM_SCMI_PROTOCOL is not set +# CONFIG_QEMU_FW_CFG is not set # end of Firmware Drivers # @@ -903,7 +858,12 @@ CONFIG_RTC_DRV_DS1307=y CONFIG_GENERIC_PHY=y CONFIG_USB_NOP_XCEIV=y CONFIG_PHY_FSL_IMX8MQ_USB=y -# CONFIG_CRYPTO_HW is not set + +# +# Hardware crypto devices +# +# CONFIG_FSL_CAAM_RNG_PBL_INIT is not set +# end of Hardware crypto devices # # Memory controller drivers @@ -938,6 +898,8 @@ CONFIG_IMX8M_FEATCTRL=y CONFIG_IMX8M_DRAM=y # end of i.MX8M DDR controllers +CONFIG_REBOOT_MODE=y +CONFIG_SYSCON_REBOOT_MODE=y # CONFIG_NVMEM_REBOOT_MODE is not set # CONFIG_POWER_RESET_SYSCON is not set # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set diff --git a/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource b/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource index 9b324876a401..d12f04949a5a 100644 --- a/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource +++ b/configs/platform-v8a/barebox-rock3a-defaultenv/init/bootsource @@ -9,6 +9,6 @@ if [ "$bootsource" = mmc ]; then global.boot.default="mmc$bootsource_instance net" of_property -df mmc1 sd-uhs-sdr50 elif [ "$bootsource" = "spi-nor" ]; then - usbgadget -A '/dev/mmc0(sd)' + usbgadget -A '/dev/mmc1(sd)' global.autoboot=abort fi diff --git a/configs/platform-v8a/barebox-rockchip.config b/configs/platform-v8a/barebox-rockchip.config index c063a97b6de9..db6cf7ec6007 100644 --- a/configs/platform-v8a/barebox-rockchip.config +++ b/configs/platform-v8a/barebox-rockchip.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2023.01.0 Configuration +# Barebox/arm 2023.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -9,32 +9,31 @@ CONFIG_TEXT_BASE=0x0 # # System Type # +CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXS is not set # CONFIG_ARCH_NOMADIK is not set -# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_OMAP_SINGLE is not set # CONFIG_ARCH_PXA is not set -CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_SOCFPGA is not set -# CONFIG_ARCH_S3C24xx is not set -# CONFIG_ARCH_S5PCxx is not set -# CONFIG_ARCH_S3C64xx is not set -# CONFIG_ARCH_STM32MP is not set # CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set -# CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCH_ARM64_VIRT is not set +# CONFIG_ARCH_BCM283X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_OMAP_MULTI is not set +CONFIG_ARCH_ROCKCHIP=y +# CONFIG_ARCH_STM32MP is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_ZYNQMP is not set # # Processor Type @@ -71,6 +70,7 @@ CONFIG_MACH_RADXA_ROCK3=y # # select board features: # +CONFIG_ARCH_ROCKCHIP_ATF=y # CONFIG_ARCH_RK3568_OPTEE is not set # end of Rockchip Features @@ -237,8 +237,11 @@ CONFIG_FASTBOOT_CMD_OEM=y CONFIG_COMPILE_LOGLEVEL=6 CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_LL is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y CONFIG_DEBUG_ROCKCHIP_UART_PORT=2 # CONFIG_DEBUG_INITCALLS is not set +# CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set @@ -463,6 +466,8 @@ CONFIG_NET_DHCP=y # # Drivers # +CONFIG_REGMAP_FORMATTED=y +CONFIG_REGMAP_I2C=y CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -582,6 +587,7 @@ CONFIG_USB_STORAGE=y # USB Miscellaneous drivers # # CONFIG_USB_HUB_USB251XB is not set +# CONFIG_USB_ONBOARD_HUB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_AUTOSTART=y @@ -646,6 +652,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_ATMEL_FLEXCOM is not set CONFIG_MFD_RK808=y # CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_ROHM_BD718XX is not set # end of Multifunction device drivers # @@ -748,6 +755,7 @@ CONFIG_RESET_CONTROLLER=y # Firmware Drivers # # CONFIG_ARM_SCMI_PROTOCOL is not set +# CONFIG_QEMU_FW_CFG is not set # end of Firmware Drivers # @@ -761,7 +769,11 @@ CONFIG_GENERIC_PHY=y # CONFIG_PHY_FSL_IMX8MQ_USB is not set CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y -# CONFIG_CRYPTO_HW is not set + +# +# Hardware crypto devices +# +# end of Hardware crypto devices # # Memory controller drivers diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make index f068865c2182..1396fa62e651 100644 --- a/configs/platform-v8a/rules/barebox-imx8m.make +++ b/configs/platform-v8a/rules/barebox-imx8m.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_IMX8M) += barebox-imx8m # # Paths and names # -BAREBOX_IMX8M_VERSION := 2023.01.0 -BAREBOX_IMX8M_MD5 := 884680a110d252e3ae18589b18848ed9 +BAREBOX_IMX8M_VERSION := 2023.04.0 +BAREBOX_IMX8M_MD5 := 322b14e079eb18c8e851084ea44d99e3 BAREBOX_IMX8M := barebox-imx8m-$(BAREBOX_IMX8M_VERSION) BAREBOX_IMX8M_SUFFIX := tar.bz2 BAREBOX_IMX8M_URL := $(call barebox-url, BAREBOX_IMX8M) diff --git a/configs/platform-v8a/rules/barebox-rockchip.make b/configs/platform-v8a/rules/barebox-rockchip.make index 87ea4730e42b..fbab38419316 100644 --- a/configs/platform-v8a/rules/barebox-rockchip.make +++ b/configs/platform-v8a/rules/barebox-rockchip.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_ROCKCHIP) += barebox-rockchip # # Paths and names # -BAREBOX_ROCKCHIP_VERSION := 2023.01.0 -BAREBOX_ROCKCHIP_MD5 := 884680a110d252e3ae18589b18848ed9 +BAREBOX_ROCKCHIP_VERSION := 2023.04.0 +BAREBOX_ROCKCHIP_MD5 := 322b14e079eb18c8e851084ea44d99e3 BAREBOX_ROCKCHIP := barebox-rockchip-$(BAREBOX_ROCKCHIP_VERSION) BAREBOX_ROCKCHIP_SUFFIX := tar.bz2 BAREBOX_ROCKCHIP_URL := $(call barebox-url, BAREBOX_ROCKCHIP) -- 2.39.2