diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-07 22:55:36 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-07 22:56:03 -0500 |
| commit | 284f8763673035e142fd40b9d3d21a1b842e15a0 (patch) | |
| tree | d966dfc9134b98940d4e77ef3194de57269892e7 /package | |
| parent | da7fd422b3463454d072bf443bee1b4bf9f9513e (diff) | |
fix cmdline.txt generation for kodi
Diffstat (limited to 'package')
| -rw-r--r-- | package/bcm28xx-bootloader/Makefile | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index f92d3e1dc..642ac4b2b 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -32,22 +32,28 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -do-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot - $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/ - printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +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) - printf "console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +CMDLINE+=console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) endif ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) - printf "console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +CMDLINE+=console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) endif ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA),y) - printf "console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +CMDLINE+=console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) endif ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL),y) - printf "console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) console=ttyAMA0,$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) root=/dev/mmcblk0p2 rootfstype=ext4 rootwait\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +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 ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y) $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt |