diff options
| -rw-r--r-- | mk/image.mk | 3 | ||||
| -rw-r--r-- | package/mtools/Makefile | 4 | ||||
| -rw-r--r-- | package/u-boot/Makefile | 10 | ||||
| -rw-r--r-- | target/arm/Makefile | 14 | ||||
| -rw-r--r-- | target/arm/systems/beaglebone-black | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 2 |
6 files changed, 32 insertions, 2 deletions
diff --git a/mk/image.mk b/mk/image.mk index 5622d4212..dfd32f3f3 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -274,7 +274,8 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package ${FW_DIR}/${GENIMAGE}: ${TARGET_DIR} kernel-package @rm -rf ${FW_DIR}/temp @mkdir -p ${FW_DIR}/temp - @dd if=/dev/zero of=${FW_DIR}/cfgfs.img bs=16M count=1 $(MAKE_TRACE) + @$(CP) $(KERNEL) $(FW_DIR)/kernel + @dd if=/dev/zero of=${FW_DIR}/cfgfs.img bs=16384 count=1 $(MAKE_TRACE) PATH='${HOST_PATH}' mke2img \ -G 4 \ -d "$(TARGET_DIR)" \ diff --git a/package/mtools/Makefile b/package/mtools/Makefile index cbf4acb97..2072e88d7 100644 --- a/package/mtools/Makefile +++ b/package/mtools/Makefile @@ -20,6 +20,10 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,MTOOLS,mtools,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,MTOOLS,mtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(OS_FOR_BUILD),Darwin) +HOST_LDFLAGS+= -liconv +endif + CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes mtools-install: diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 64a8fb81d..cf786d4f0 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro solidrun-imx6 +PKG_SYSTEM_DEPENDS:= beaglebone-black raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro solidrun-imx6 include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -42,6 +42,10 @@ ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) CONFIG:= Bananapro_defconfig UBOOT:= u-boot-sunxi-with-spl.bin endif +ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) +CONFIG:= am335x_evm_defconfig +UBOOT:= u-boot.img +endif HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" @@ -95,6 +99,10 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) $(INSTALL_BIN) $(WRKBUILD)/SPL $(FW_DIR) $(INSTALL_BIN) ./files/boot.script.imx6 $(FW_DIR) endif +ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) + $(CP) ./files/uEnv.txt.bbb $(FW_DIR)/uEnv.txt + $(INSTALL_BIN) $(WRKBUILD)/MLO $(FW_DIR) +endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/target/arm/Makefile b/target/arm/Makefile index b7e5e9f98..e298ff2d7 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -128,6 +128,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-arm $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(ROOTFSJFFS2)' endif endif +ifeq ($(ADK_TARGET_FS),genimage) +targethelp: + @echo "The disk image is: $(FW_DIR)/disk.img" + @echo "Use following command to install it on SD card:" + @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' +endif kernel-strip: ifeq ($(ADK_TARGET_KERNEL_VERSION_RPI),y) @@ -157,6 +163,11 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERS env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ dtbs $(MAKE_TRACE) endif +ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ + am335x-boneblack.dtb + cp $(LINUX_DIR)/arch/arm/boot/dts/am335x-boneblack.dtb ${TARGET_DIR}/boot +endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ dtbs $(MAKE_TRACE) @@ -192,6 +203,9 @@ endif ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: dtb-install createinitramfs targethelp endif +ifeq (${ADK_TARGET_FS},genimage) +imageinstall: dtb-install $(FW_DIR)/$(GENIMAGE) targethelp +endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black index 736975ae0..d14e6da19 100644 --- a/target/arm/systems/beaglebone-black +++ b/target/arm/systems/beaglebone-black @@ -16,6 +16,7 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION + select ADK_PACKAGE_U_BOOT help BeagleBone Black diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index af8fed395..34d1ec2de 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -242,6 +242,8 @@ config ADK_KERNEL_SERIAL_PMACZILOG config ADK_KERNEL_SERIAL_OMAP bool "omap serial driver" + select ADK_KERNEL_SERIAL_8250 + select ADK_KERNEL_SERIAL_8250_CONSOLE select ADK_KERNEL_SERIAL_OMAP_CONSOLE depends on ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default y if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK |