diff options
| -rw-r--r-- | mk/linux.mk | 1 | ||||
| -rw-r--r-- | package/u-boot/Makefile | 2 | ||||
| -rw-r--r-- | target/arm/Makefile | 14 | ||||
| -rw-r--r-- | target/arm/beaglebone-black/extlinux.conf | 4 | ||||
| -rw-r--r-- | target/arm/beaglebone-black/genimage.cfg | 10 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 7 |
7 files changed, 30 insertions, 9 deletions
diff --git a/mk/linux.mk b/mk/linux.mk index 920c1749b..09f62c2da 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -7,6 +7,7 @@ ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) PKG_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT) PKG_GIT:= $(ADK_TARGET_LINUX_KERNEL_GIT_TYPE) PKG_SITES:= $(ADK_TARGET_LINUX_KERNEL_GIT_REPO) +DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.gz else PKG_VERSION:= $(KERNEL_FILE_VER) PKG_SITES:= ${MASTER_SITE_KERNEL:=kernel/v6.x/} \ diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 576a98abd..c3976e0ce 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -113,7 +113,7 @@ u-boot-hostinstall: $(STAGING_HOST_DIR)/usr/bin do-configure: - (cd $(WRKBUILD) && $(MAKE) $(CONFIG)) + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' $(MAKE) $(CONFIG)) do-build: (cd $(WRKBUILD) && env \ diff --git a/target/arm/Makefile b/target/arm/Makefile index d6dab6af0..1f449dbe9 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -85,6 +85,11 @@ ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) @echo "sudo ./scripts/install.sh phytec-imx6 /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" @echo endif +ifeq ($(ADK_TARGET_SYSTEM_BEAGEBONE_BLACK),y) + @echo "Use following command to install it on SD card:" + @echo "sudo ./scripts/install.sh beaglebone-black /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" + @echo +endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) @echo "Use following command to install it on SD card:" @echo "sudo ./scripts/install.sh banana-pro /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" @@ -175,7 +180,7 @@ ifeq ($(ADK_TARGET_FS),squashfs) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) VENDOR:=arm/ endif @@ -194,6 +199,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) VENDOR:=nxp/imx/ endif +ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) +VENDOR:=ti/omap/ +endif endif dtb-install: @@ -218,8 +226,8 @@ ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) cp $(LINUX_DIR)/arch/arm/boot/dts/imx6q-phytec-pbab01.dtb ${TARGET_DIR}/boot endif ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) - ${KERNEL_MAKE} am335x-boneblack.dtb $(MAKE_TRACE) - cp $(LINUX_DIR)/arch/arm/boot/dts/am335x-boneblack.dtb ${TARGET_DIR}/boot + ${KERNEL_MAKE} $(VENDOR)am335x-boneblack.dtb $(MAKE_TRACE) + cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)am335x-boneblack.dtb ${TARGET_DIR}/boot endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) diff --git a/target/arm/beaglebone-black/extlinux.conf b/target/arm/beaglebone-black/extlinux.conf new file mode 100644 index 000000000..d750a5845 --- /dev/null +++ b/target/arm/beaglebone-black/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-black + kernel /kernel + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/target/arm/beaglebone-black/genimage.cfg b/target/arm/beaglebone-black/genimage.cfg index b09ee55a1..6328a4397 100644 --- a/target/arm/beaglebone-black/genimage.cfg +++ b/target/arm/beaglebone-black/genimage.cfg @@ -4,12 +4,15 @@ image boot.vfat { "MLO", "u-boot.img", "uEnv.txt", + "kernel", + "am335x-boneblack.dtb", + "extlinux" } } size = 16M } -image disk.img { +image sdcard.img { hdimage { } @@ -24,4 +27,9 @@ image disk.img { image = "rootfs.ext" size = 512M } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } } diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 2a09782cf..438d4791e 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -374,7 +374,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyS2" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "ttyPS0" if ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ default "ttysclp0" if ADK_TARGET_SYSTEM_QEMU_S390 - default "ttyO2" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "ttyO0" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "ttyS4" if ADK_TARGET_SYSTEM_IMGTEC_CI20 default "ttySTM0" if ADK_TARGET_SYSTEM_ST_STM32F746G diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 1c7097780..aa9e5609a 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -34,7 +34,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT depends on !ADK_TARGET_ARCH_FRV depends on !ADK_TARGET_ARCH_H8300 select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK + select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK @@ -251,7 +251,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default "c85fbc86c61a8c8fd45ab1fe3d1bdd2df12f7962" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "8624998967676862843aed1f8ee2141e98987f81" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK + default "v6.6.32-ti-arm32-r7" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "stable-4.4-rockpi4" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "v4.4.52-phy" if ADK_TARGET_SYSTEM_PHYTEC_WEGA @@ -261,7 +261,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER default "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "6.1.70" if ADK_TARGET_BOARD_BCM28XX default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS - default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK + default "6.6.32" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70 default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 @@ -274,6 +274,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_TYPE default "branch" if ADK_TARGET_LINUX_ARCH_LM32 default "branch" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "branch" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS + default "branch" if ADK_TARGET_SYSTEM_BEAGLEBONE_BACK default "hash" config ADK_TARGET_LINUX_KERNEL_NO_MIRROR |