diff options
| author | Christian Lamparter <chunkeey@gmail.com> | 2018-12-27 21:56:28 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-01-24 15:53:02 +0100 |
| commit | 1aa00f9d139045db80d2238075f184a3418a07e4 (patch) | |
| tree | a45b2dfd2e97ff5e95e38355b6dfb7ca73acd0c5 | |
| parent | b1781d58410596004f0f428706a4f65645eb6565 (diff) | |
| download | upstream-1aa00f9d139045db80d2238075f184a3418a07e4.tar.gz upstream-1aa00f9d139045db80d2238075f184a3418a07e4.tar.bz2 upstream-1aa00f9d139045db80d2238075f184a3418a07e4.zip | |
brcm2708: boot-part feature integration
This patch adds the boot-part feature which enables the brcm2708
target move from the custom boot partition size config option to
the generic CONFIG_TARGET_KERNEL_PARTSIZE.
Note:
For people using custom images: Just like with
CONFIG_TARGET_ROOTFS_PARTSIZE changing the value
can cause sysupgrade to repartition the device!
Make sure to have a backup in this case.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
| -rw-r--r-- | config/Config-images.in | 1 | ||||
| -rw-r--r-- | target/linux/brcm2708/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm2708/image/Config.in | 5 | ||||
| -rw-r--r-- | target/linux/brcm2708/image/Makefile | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/config/Config-images.in b/config/Config-images.in index 245aed098b..a0c7b7a94d 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -270,6 +270,7 @@ menu "Target Images" int "Kernel partition size (in MB)" depends on GRUB_IMAGES || USES_BOOT_PART default 8 if TARGET_apm821xx_sata + default 20 if TARGET_brcm2708 default 16 config TARGET_ROOTFS_PARTSIZE diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index f4dd86767c..11908f5c2f 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=brcm2708 BOARDNAME:=Broadcom BCM27xx -FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part +FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part boot-part MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> SUBTARGETS:=bcm2708 bcm2709 bcm2710 diff --git a/target/linux/brcm2708/image/Config.in b/target/linux/brcm2708/image/Config.in deleted file mode 100644 index f7abd9d39d..0000000000 --- a/target/linux/brcm2708/image/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BRCM2708_SD_BOOT_PARTSIZE - int "Boot (SD Card) filesystem partition size (in MB)" - depends on TARGET_brcm2708 - default 20 - diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index f2d8cec326..cd00d7f394 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk FAT32_BLOCK_SIZE=1024 -FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) +FAT32_BLOCKS=$(shell echo $$(($(CONFIG_TARGET_KERNEL_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) define Build/Compile $(CP) $(LINUX_DIR)/COPYING $(KDIR)/COPYING.linux @@ -44,7 +44,7 @@ endef define Build/sdcard-img ./gen_rpi_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \ - $(CONFIG_BRCM2708_SD_BOOT_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) + $(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) endef ### Devices ### |