diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-08-23 09:57:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-08-23 09:57:55 +0200 |
| commit | 5b0c3cb80d1e16346f42165230496336e6d06de9 (patch) | |
| tree | c2590a2e0e69b068e705dbc96f24a9e01f93a4e4 /arch/arm/configs | |
| parent | 33f8161a72e2dd4911b60cb0eaee5f1a3a1bd0f3 (diff) | |
| parent | 411e9ba6e803a35feb35ed2544e0cdf555161d65 (diff) | |
| download | barebox-5b0c3cb80d1e16346f42165230496336e6d06de9.tar.gz barebox-5b0c3cb80d1e16346f42165230496336e6d06de9.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v8_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v8_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/rockchip_v8_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v8_defconfig b/arch/arm/configs/imx_v8_defconfig index 99d871bfb9..8084e72ea0 100644 --- a/arch/arm/configs/imx_v8_defconfig +++ b/arch/arm/configs/imx_v8_defconfig @@ -7,6 +7,7 @@ CONFIG_MACH_NXP_IMX8MQ_EVK=y CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y CONFIG_MACH_POLYHEX_DEBIX=y CONFIG_MACH_PROTONIC_IMX8M=y +CONFIG_MACH_SKOV_IMX8MP=y CONFIG_MACH_TQ_MBA8MPXL=y CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP=y CONFIG_MACH_ZII_IMX8MQ_DEV=y diff --git a/arch/arm/configs/multi_v8_defconfig b/arch/arm/configs/multi_v8_defconfig index 77ad8a2688..20f630281d 100644 --- a/arch/arm/configs/multi_v8_defconfig +++ b/arch/arm/configs/multi_v8_defconfig @@ -11,6 +11,7 @@ CONFIG_MACH_NXP_IMX8MQ_EVK=y CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y CONFIG_MACH_POLYHEX_DEBIX=y CONFIG_MACH_PROTONIC_IMX8M=y +CONFIG_MACH_SKOV_IMX8MP=y CONFIG_MACH_TQ_MBA8MPXL=y CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP=y CONFIG_MACH_ZII_IMX8MQ_DEV=y diff --git a/arch/arm/configs/rockchip_v8_defconfig b/arch/arm/configs/rockchip_v8_defconfig index 7d1d41965e..35ff8963a7 100644 --- a/arch/arm/configs/rockchip_v8_defconfig +++ b/arch/arm/configs/rockchip_v8_defconfig @@ -93,7 +93,7 @@ CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_NET_DESIGNWARE_ROCKCHIP=y -CONFIG_REALTEK_PHY=y +CONFIG_DRIVER_NET_RTL8169=y CONFIG_SMSC_PHY=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y @@ -132,6 +132,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED=y CONFIG_REGULATOR_ARM_SCMI=y CONFIG_REGULATOR_RK808=y +CONFIG_PCI_ROCKCHIP=y CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_GENERIC_PHY=y CONFIG_USB_NOP_XCEIV=y diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 8c9c1f7642..0050dd2e4f 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -1,5 +1,8 @@ CONFIG_ARCH_SOCFPGA=y +CONFIG_MACH_SOCFPGA_ALTERA_SOCDK=y CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y +CONFIG_MACH_SOCFPGA_ENCLUSTRA_AA1=y +CONFIG_MACH_SOCFPGA_REFLEX_ACHILLES=y CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y CONFIG_MACH_SOCFPGA_TERASIC_DE10_NANO=y CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y |