summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-11-15 14:21:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-11-15 14:21:23 +0100
commit64f85586d1dcb30eddd3d5d9ed39117bafb7da89 (patch)
tree0b3a56ae9130ac91c47eda596fb4527d02a20de3 /arch
parent0fdbd47ac4ff832f1c950db0b6ccb2eda3824158 (diff)
parent2eb68ed872c25b4d8223a4e0e56c59eae836ba36 (diff)
downloadbarebox-64f85586d1dcb30eddd3d5d9ed39117bafb7da89.tar.gz
barebox-64f85586d1dcb30eddd3d5d9ed39117bafb7da89.tar.xz
Merge branch 'for-next/scripts-common-library'
Diffstat (limited to 'arch')
-rw-r--r--arch/sandbox/configs/hosttools_defconfig1
-rw-r--r--arch/sandbox/configs/targettools_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/sandbox/configs/hosttools_defconfig b/arch/sandbox/configs/hosttools_defconfig
index 7d33853124..0b62b648c7 100644
--- a/arch/sandbox/configs/hosttools_defconfig
+++ b/arch/sandbox/configs/hosttools_defconfig
@@ -4,3 +4,4 @@ CONFIG_ARCH_IMX_USBLOADER=y
CONFIG_MVEBU_HOSTTOOLS=y
CONFIG_OMAP3_USB_LOADER=y
CONFIG_OMAP4_HOSTTOOL_USBBOOT=y
+CONFIG_RK_USB_LOADER=y
diff --git a/arch/sandbox/configs/targettools_defconfig b/arch/sandbox/configs/targettools_defconfig
index d06074790c..22845def61 100644
--- a/arch/sandbox/configs/targettools_defconfig
+++ b/arch/sandbox/configs/targettools_defconfig
@@ -7,3 +7,4 @@ CONFIG_MVEBU_KWBOOT_TARGET=y
CONFIG_ARCH_IMX_USBLOADER_TARGET=y
CONFIG_OMAP3_USB_LOADER_TARGET=y
CONFIG_OMAP4_USBBOOT_TARGET=y
+CONFIG_RK_USB_LOADER_TARGET=y