From 5c126258230b2490133ef2f6f9fffb1a6a4e6053 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 22 Feb 2017 15:30:55 +0100 Subject: raspberry-pi3: fix mini.config bootup - cmdline.txt is not required with full device tree capable kernel - force 270x option for mkknlimg trailer - we need ext4 filesystem support in the kernel other filesystems are rarely used at the moment - ATAGS and CMDLINE_FROM_BOOTLOADER not required with device tree capable kernel - overlay dtb files are renamed to dtbo suffix --- mk/rootfs.mk | 2 +- package/bcm28xx-bootloader/Makefile | 18 ------------------ scripts/install.sh | 4 ++-- target/arm/Makefile | 6 +++--- target/config/Config.in.rootfs | 10 ++++++---- 5 files changed, 12 insertions(+), 28 deletions(-) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 0d273a30e..027c671b6 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -39,7 +39,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) BLOCKDEV:= root=/dev/sda1 endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) +ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) BLOCKDEV:= root=/dev/mmcblk0p2 endif diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 3a4a99c51..a7909ca15 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -34,27 +34,9 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -CMDLINE:=root=/dev/mmcblk0p2 rootfstype=ext4 rootwait -ifeq ($(ADK_APPLIANCE_KODI),y) -CMDLINE+=consoleblank=0 vt.global_cursor_default=0 -endif -ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y) -CMDLINE+=console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) -endif -ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) -CMDLINE+=console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) -endif -ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA),y) -CMDLINE+=console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) -endif -ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL),y) -CMDLINE+=console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) -endif - do-install: $(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/ - printf "$(CMDLINE)\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "dtparam=audio,i2s,spi,i2c\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt diff --git a/scripts/install.sh b/scripts/install.sh index 8ae923a8d..9bbdf3758 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -553,8 +553,8 @@ case $target { break done mkdir "$B/"overlays - for x in "$fwdir"/overlays/*.dtb; do - [[ -e "$x" ]] && cp "$fwdir"/overlays/*.dtb "$B/"overlays + for x in "$fwdir"/overlays/*.dtbo; do + [[ -e "$x" ]] && cp "$fwdir"/overlays/*.dtbo "$B/"overlays break done umount_fs "$B" diff --git a/target/arm/Makefile b/target/arm/Makefile index 9b9d7bf4f..527c4a4f1 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -138,7 +138,7 @@ endif kernel-strip: ifeq ($(ADK_TARGET_KERNEL_GIT_REPO_NAME),rpi) @echo adding DT trailer to kernel $(MAKE_TRACE) - PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) + PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg --270x --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) else @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif @@ -172,8 +172,8 @@ ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ dtbs $(MAKE_TRACE) mkdir -p $(FW_DIR)/overlays - for x in $(LINUX_DIR)/arch/arm/boot/dts/overlays/*.dtb; do \ - [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/overlays/*.dtb $(FW_DIR)/overlays; \ + for x in $(LINUX_DIR)/arch/arm/boot/dts/overlays/*.dtbo; do \ + [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/overlays/*.dtbo $(FW_DIR)/overlays; \ break; \ done endif diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 9b6a007ab..d4bae7822 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -145,16 +145,18 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE Use this option if your planning to create a initramfs. config ADK_TARGET_ROOTFS_ARCHIVE - bool "Archive usable for different filesystems" + bool "Archive usable for ext4 filesystems" select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX - select ADK_KERNEL_EXT2_FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX - select ADK_TARGET_QEMU_WITH_BLOCK + select ADK_KERNEL_EXT4_FS + select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on !ADK_TARGET_SIM \ && !ADK_TARGET_ARCH_NDS32 \ && !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 \ && !ADK_TARGET_SYSTEM_QEMU_METAG help - Use this option if your root filesystem is ext2/ext3/ext4/xfs. + Use this option if your root filesystem is ext4 and you use + for example install.sh to install firmware on a block device + connected to your development machine. config ADK_TARGET_ROOTFS_GENIMAGE bool "Create a disk image for the target" -- cgit v1.2.3