diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-18 21:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-18 22:42:50 +0200 |
| commit | bd2722a8ac4f4ec721a1c4b4613b7dd488b20099 (patch) | |
| tree | 0ae14661a97e718ddb18a304ef18001c358fb6a4 | |
| parent | 797c4ecbf18c80729d782d92edba93c600d80ad6 (diff) | |
rpi3: update kernel + bootloader, unbreak rpi3 aarch64
| -rw-r--r-- | package/bcm28xx-bootloader/Makefile | 5 | ||||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/bootcode.bin | bin | 17920 -> 50248 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/fixup.dat | bin | 6469 -> 6678 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/fixup_cd.dat | bin | 2497 -> 2583 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/fixup_db.dat | bin | 9716 -> 9823 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/fixup_x.dat | bin | 9720 -> 9819 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/start.elf | bin | 2741240 -> 2859652 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/start_cd.elf | bin | 614008 -> 659460 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/start_db.elf | bin | 4889800 -> 4998244 bytes | |||
| -rw-r--r-- | package/bcm28xx-bootloader/src/boot/start_x.elf | bin | 3841928 -> 3943428 bytes | |||
| -rw-r--r-- | target/aarch64/Makefile | 5 | ||||
| -rw-r--r-- | target/config/Config.in.addons | 3 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion | 4 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 3 |
14 files changed, 10 insertions, 10 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 5e097b0eb..863e19e51 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -4,7 +4,8 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-bootloader -PKG_VERSION:= ca9116ffd0cea06fdeb876ac7d19790bf2631d8c +# not cloned, local src directory used +PKG_VERSION:= 63fd4a88e70b1ea70783dd408c2df12db74605c9 PKG_RELEASE:= 1 PKG_DESCR:= bootloader for bcm28xx PKG_SECTION:= base/boot @@ -92,7 +93,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) printf "arm_control=0x200\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt - printf "kernel_old=1\n" >> \ + printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y) diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 0e55e7567..e8afbd61c 100644 --- a/package/bcm28xx-bootloader/src/boot/bootcode.bin +++ b/package/bcm28xx-bootloader/src/boot/bootcode.bin diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat Binary files differindex 5a761aba9..4422d6fbc 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat Binary files differindex 40b9b2093..889ab95d6 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat Binary files differindex df5edefb8..a989d9c65 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat Binary files differindex 62989db78..8ef3331a1 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_x.dat diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf Binary files differindex f92722326..6585fc346 100644 --- a/package/bcm28xx-bootloader/src/boot/start.elf +++ b/package/bcm28xx-bootloader/src/boot/start.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf Binary files differindex 4ca0d3b52..26b6ef792 100644 --- a/package/bcm28xx-bootloader/src/boot/start_cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start_cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf Binary files differindex 45cd5f06b..0d6762395 100644 --- a/package/bcm28xx-bootloader/src/boot/start_db.elf +++ b/package/bcm28xx-bootloader/src/boot/start_db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf Binary files differindex c9fb0ca11..764c04322 100644 --- a/package/bcm28xx-bootloader/src/boot/start_x.elf +++ b/package/bcm28xx-bootloader/src/boot/start_x.elf diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index ad4c30b31..c96264c39 100644 --- a/target/aarch64/Makefile +++ b/target/aarch64/Makefile @@ -56,12 +56,7 @@ endif 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 $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE) -else @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons index 1ea1ed955..1a7ed1e51 100644 --- a/target/config/Config.in.addons +++ b/target/config/Config.in.addons @@ -3,7 +3,8 @@ choice prompt "Optional hardware configuration" -depends on ADK_TARGET_OS_LINUX && ADK_TARGET_SYSTEM_RASPBERRY_PI3 +depends on ADK_TARGET_OS_LINUX && ADK_TARGET_SYSTEM_RASPBERRY_PI3 \ + || ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 config ADK_TARGET_HARDWARE_RPI3_SERIAL bool "enable serial" diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index 5f41be381..32ea2e26c 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -223,7 +223,7 @@ config ADK_TARGET_KERNEL_GIT_REPO_NAME config ADK_TARGET_KERNEL_GIT string "git version" depends on ADK_TARGET_KERNEL_VERSION_GIT - default "8327f281c8d5083b13b3a4e6e2a36ee7c3d67913" if ADK_TARGET_BOARD_BCM28XX + default "cfa29b46af94d83e31aa000dbaee553f9c4d670c" if ADK_TARGET_BOARD_BCM28XX default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 default "1d008423ab5fd12459f53342e4d17585ec63cfe4" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG @@ -233,7 +233,7 @@ config ADK_TARGET_KERNEL_GIT config ADK_TARGET_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_KERNEL_VERSION_GIT - default "4.9.31" if ADK_TARGET_BOARD_BCM28XX + default "4.9.37" if ADK_TARGET_BOARD_BCM28XX default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index b2a462e0a..133b8d0d0 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -298,6 +298,7 @@ config ADK_RUNTIME_GETTY_VGA default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_IBM_X40 @@ -354,6 +355,8 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 + default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3 + default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 default "ttyDA1" if ADK_TARGET_SYSTEM_QEMU_METAG default "ttyS2" if ADK_TARGET_SYSTEM_KINETIS_K70 default "ttyS2" if ADK_TARGET_SYSTEM_SOM_C6745 |