diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
| commit | 57c475b48dcf8e41ddaaa77686ea41adb9049dc5 (patch) | |
| tree | a1079bd20b46b267991c96b3ceb9cd33ef5d60f9 /arch/arm | |
| parent | d1ca07111d6214c232b8f419f0daa98c6e0835f6 (diff) | |
| parent | 526dddf4c3493a7b7732d9bd0aab2d3e22b3154a (diff) | |
| download | barebox-57c475b48dcf8e41ddaaa77686ea41adb9049dc5.tar.gz barebox-57c475b48dcf8e41ddaaa77686ea41adb9049dc5.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap/Kconfig | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c6a4cadb32..3555b4ee53 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -265,7 +265,6 @@ source arch/arm/mach-ep93xx/Kconfig source arch/arm/mach-highbank/Kconfig source arch/arm/mach-imx/Kconfig source arch/arm/mach-mxs/Kconfig -source scripts/imx/Kconfig source arch/arm/mach-mvebu/Kconfig source arch/arm/mach-netx/Kconfig source arch/arm/mach-nomadik/Kconfig @@ -421,3 +420,4 @@ source drivers/Kconfig source fs/Kconfig source lib/Kconfig source crypto/Kconfig +source firmware/Kconfig diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index e8fc4b843a..c451cf0d47 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -138,12 +138,6 @@ config OMAP3_USBBOOT which is already initialized by the ROM code. Use the omap3-usb-loader tool selectable below to upload images. -config OMAP3_USB_LOADER - bool "enable omap3 USB loader host tool" - depends on ARCH_OMAP3 - help - Say Y here to build the omap3 usb loader tool. - config OMAP_SERIALBOOT bool "enable booting from serial" select XYMODEM |