From 2777f2edbf367f4a36e3f0fb393fa74077e405c9 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 31 May 2018 18:47:23 +0200 Subject: platforms: merge image sections Keep the image2 section for BSPs that still use it. Signed-off-by: Michael Olbrich --- platforms/Kconfig | 3 --- platforms/image-boot-mlo.in | 2 +- platforms/image-boot-vfat.in | 2 +- platforms/image-hd-vdi.in | 2 +- platforms/image-hdimg.in | 2 +- platforms/image-rauc.in | 2 +- platforms/image-root-cpio-gz.in | 2 +- platforms/image-root-cpio.in | 2 +- platforms/image-root-ext.in | 2 +- platforms/image-root-tgz.in | 2 +- platforms/image-root-ubi.in | 2 +- platforms/image-root-ubifs.in | 2 +- platforms/image2-dummy.in | 2 ++ 13 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 platforms/image2-dummy.in (limited to 'platforms') diff --git a/platforms/Kconfig b/platforms/Kconfig index 0236686c4..dedc9a9e8 100644 --- a/platforms/Kconfig +++ b/platforms/Kconfig @@ -27,9 +27,6 @@ endmenu menu "image creation options " source "generated/image.in" -endmenu - -menu "new image creation options " source "generated/image2.in" endmenu diff --git a/platforms/image-boot-mlo.in b/platforms/image-boot-mlo.in index e8ed775ce..842cd7990 100644 --- a/platforms/image-boot-mlo.in +++ b/platforms/image-boot-mlo.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image config IMAGE_BOOT_MLO tristate diff --git a/platforms/image-boot-vfat.in b/platforms/image-boot-vfat.in index 7dfee6b92..d5d058cf4 100644 --- a/platforms/image-boot-vfat.in +++ b/platforms/image-boot-vfat.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image menuconfig IMAGE_BOOT_VFAT tristate diff --git a/platforms/image-hd-vdi.in b/platforms/image-hd-vdi.in index 92d1831dc..bce352076 100644 --- a/platforms/image-hd-vdi.in +++ b/platforms/image-hd-vdi.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image config IMAGE_HD_VDI tristate diff --git a/platforms/image-hdimg.in b/platforms/image-hdimg.in index 232d4dd3b..150ff7563 100644 --- a/platforms/image-hdimg.in +++ b/platforms/image-hdimg.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image menuconfig IMAGE_HDIMG bool diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in index 85c8461d3..658ddd5cd 100644 --- a/platforms/image-rauc.in +++ b/platforms/image-rauc.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image menuconfig IMAGE_RAUC tristate diff --git a/platforms/image-root-cpio-gz.in b/platforms/image-root-cpio-gz.in index 79a789ac0..e1feb5f9b 100644 --- a/platforms/image-root-cpio-gz.in +++ b/platforms/image-root-cpio-gz.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image config IMAGE_ROOT_CPIO_GZ tristate diff --git a/platforms/image-root-cpio.in b/platforms/image-root-cpio.in index 28c589c44..f5ee4c1d8 100644 --- a/platforms/image-root-cpio.in +++ b/platforms/image-root-cpio.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image config IMAGE_ROOT_CPIO tristate diff --git a/platforms/image-root-ext.in b/platforms/image-root-ext.in index 903bdf33d..950a59c41 100644 --- a/platforms/image-root-ext.in +++ b/platforms/image-root-ext.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image menuconfig IMAGE_ROOT_EXT tristate diff --git a/platforms/image-root-tgz.in b/platforms/image-root-tgz.in index 8cb05d8d1..fce1516e7 100644 --- a/platforms/image-root-tgz.in +++ b/platforms/image-root-tgz.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image config IMAGE_ROOT_TGZ tristate diff --git a/platforms/image-root-ubi.in b/platforms/image-root-ubi.in index 46a6cd2c2..fe5d7c876 100644 --- a/platforms/image-root-ubi.in +++ b/platforms/image-root-ubi.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image config IMAGE_ROOT_UBI tristate diff --git a/platforms/image-root-ubifs.in b/platforms/image-root-ubifs.in index e5820e4b2..a34a8ee5e 100644 --- a/platforms/image-root-ubifs.in +++ b/platforms/image-root-ubifs.in @@ -1,4 +1,4 @@ -## SECTION=image2 +## SECTION=image menuconfig IMAGE_ROOT_UBIFS tristate diff --git a/platforms/image2-dummy.in b/platforms/image2-dummy.in new file mode 100644 index 000000000..384c2ec22 --- /dev/null +++ b/platforms/image2-dummy.in @@ -0,0 +1,2 @@ +## SECTION=image2 +# make sure generated/image2.in exists -- cgit v1.2.3