diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:35 +0200 |
| commit | 2b948a834c04fb76ca8319c11ee57d752c6e00da (patch) | |
| tree | 41f14595b68447a8854a49b1db15c149ebb0b8f7 /arch/ppc | |
| parent | bfcdde155359436a95e72d6f1606571a75a0a4ed (diff) | |
| parent | d323e9f6e79bbda21affa663d1974cf23979756a (diff) | |
| download | barebox-2b948a834c04fb76ca8319c11ee57d752c6e00da.tar.gz barebox-2b948a834c04fb76ca8319c11ee57d752c6e00da.tar.xz | |
Merge branch 'for-next/bootm'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/configs/p1010rdb_defconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/configs/p1022ds_defconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/configs/pcm030_defconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/configs/p1010rdb_defconfig b/arch/ppc/configs/p1010rdb_defconfig index d193940d46..a891a6c4af 100644 --- a/arch/ppc/configs/p1010rdb_defconfig +++ b/arch/ppc/configs/p1010rdb_defconfig @@ -8,7 +8,7 @@ CONFIG_AUTO_COMPLETE=y CONFIG_CMD_PARTITION=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y -CONFIG_CMD_BOOTM_VERBOSE=y +CONFIG_BOOTM_VERBOSE=y CONFIG_ZLIB=y CONFIG_BZLIB=y CONFIG_CMD_EDIT=y diff --git a/arch/ppc/configs/p1022ds_defconfig b/arch/ppc/configs/p1022ds_defconfig index c517336e61..4d0fe991ab 100644 --- a/arch/ppc/configs/p1022ds_defconfig +++ b/arch/ppc/configs/p1022ds_defconfig @@ -7,7 +7,7 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_CMD_BOOTM_ZLIB=y CONFIG_CMD_BOOTM_BZLIB=y -CONFIG_CMD_BOOTM_VERBOSE=y +CONFIG_BOOTM_VERBOSE=y CONFIG_ZLIB=y CONFIG_BZLIB=y CONFIG_CMD_EDIT=y diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig index fd010c803e..96f35a1067 100644 --- a/arch/ppc/configs/pcm030_defconfig +++ b/arch/ppc/configs/pcm030_defconfig @@ -10,7 +10,7 @@ CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_REGINFO=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_SHOW_TYPE=y CONFIG_CMD_GO=y CONFIG_CMD_RESET=y CONFIG_CMD_UIMAGE=y |