diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 88107f6e121a3a1835aa261a39a0a284e06457ce (patch) | |
| tree | b8f7a1618c29215aa3bfa0c24fe99bdffb4da650 /common | |
| parent | ae982001331215adb009cc93701401623b2a94d7 (diff) | |
| parent | 0d98114eb218aa80379b82192499e4c91d64123c (diff) | |
| download | barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.gz barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 5 | ||||
| -rw-r--r-- | common/Makefile | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/common/Kconfig b/common/Kconfig index 37bc123a87..8eec66175b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -47,6 +47,11 @@ config BINFMT bool select FILETYPE +config UIMAGE + select UNCOMPRESS + select CRC32 + bool + config GLOBALVAR bool diff --git a/common/Makefile b/common/Makefile index a1926d346d..d99dfa271a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -24,8 +24,8 @@ obj-$(CONFIG_CONSOLE_FULL) += console.o obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o obj-$(CONFIG_DIGEST) += digest.o obj-$(CONFIG_ENVIRONMENT_VARIABLES) += env.o -obj-$(CONFIG_CMD_BOOTM) += image.o -obj-$(CONFIG_CMD_BOOTM) += uimage.o +obj-$(CONFIG_UIMAGE) += image.o +obj-$(CONFIG_UIMAGE) += uimage.o obj-y += startup.o obj-y += misc.o obj-y += memsize.o |