diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:31 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:31 +0200 |
commit | 6021818e3d7933da580f83972cb0d8556df6659c (patch) | |
tree | 676f87b0549e6d6776209234b73e700f5dd2cbc1 /common | |
parent | 2385424e3034e7d309d39658938ee61cf9897ddf (diff) | |
parent | fd5cd6084afc0595f76f0e6caab4589a9bdeb5a5 (diff) | |
download | barebox-6021818e3d7933da580f83972cb0d8556df6659c.tar.gz barebox-6021818e3d7933da580f83972cb0d8556df6659c.tar.xz |
Merge branch 'for-next/arm-remove-arch-init-ll'
Conflicts:
arch/arm/include/asm/barebox-arm.h
Diffstat (limited to 'common')
-rw-r--r-- | common/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/common/Kconfig b/common/Kconfig index 0597c9cb62..9210739ee4 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -296,9 +296,6 @@ config MACH_DO_LOWLEVEL_INIT on many platforms. Disabling this option allows configurations to use barebox as a second stage boot loader. -config ARCH_HAS_LOWLEVEL_INIT - bool - config PROMPT string prompt "barebox command prompt" |