diff options
-rw-r--r-- | package/u-boot/Makefile | 8 | ||||
-rw-r--r-- | target/avr32/Makefile | 26 | ||||
-rw-r--r-- | target/avr32/kernel/atmel-ngw100 | 6 | ||||
-rw-r--r-- | target/avr32/systems/atmel-ngw100 | 10 | ||||
-rw-r--r-- | target/config/Config.in.kernel | 1 | ||||
-rw-r--r-- | target/config/Config.in.target | 6 |
6 files changed, 52 insertions, 5 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index e0ba6dccf..61674a28e 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -10,9 +10,8 @@ PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= git://git.denx.de/u-boot.git -NO_CHECKSUM:= 1 -PKG_SYSTEM_DEPENDS:= raspberry-pi +PKG_SYSTEM_DEPENDS:= raspberry-pi atmel-ngw100 include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -23,6 +22,9 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig endif +ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y) +CONFIG:= atngw100_defconfig +endif HOST_STYLE:= manual CONFIG_STYLE:= manual @@ -47,7 +49,7 @@ do-build: GCC_HONOUR_COPTS=s $(MAKE)) u-boot-install: - $(CP) $(WRKBUILD)/u-boot $(FW_DIR) + $(CP) $(WRKBUILD)/u-boot.bin $(FW_DIR) include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/target/avr32/Makefile b/target/avr32/Makefile index ebc17340e..f277f3715 100644 --- a/target/avr32/Makefile +++ b/target/avr32/Makefile @@ -7,3 +7,29 @@ include $(ADK_TOPDIR)/mk/modules.mk include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk +KERNEL:=$(LINUX_DIR)/arch/avr32/boot/images/uImage + +# target helper text +ifeq ($(ADK_TARGET_FS),archive) +targethelp: + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" +endif +ifeq ($(ADK_TARGET_FS),nfsroot) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo 'The nfs root tarball is: ${FW_DIR}/${ROOTFSUSERTARBALL}' +endif + +kernel-strip: + cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) + +kernel-install: kernel-strip + cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + +# filesystem specific targets +ifeq ($(ADK_TARGET_FS),archive) +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp +endif +ifeq ($(ADK_TARGET_FS),nfsroot) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +endif diff --git a/target/avr32/kernel/atmel-ngw100 b/target/avr32/kernel/atmel-ngw100 new file mode 100644 index 000000000..9ddc7e27b --- /dev/null +++ b/target/avr32/kernel/atmel-ngw100 @@ -0,0 +1,6 @@ +CONFIG_AVR32=y +CONFIG_PLATFORM_AT32AP=y +CONFIG_CPU_AT32AP700X=y +CONFIG_CPU_AT32AP7000=y +CONFIG_BOARD_ATNGW100_COMMON=y +CONFIG_BOARD_ATNGW100_MKI=y diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100 new file mode 100644 index 000000000..8d6aba14c --- /dev/null +++ b/target/avr32/systems/atmel-ngw100 @@ -0,0 +1,10 @@ +config ADK_TARGET_SYSTEM_ATMEL_NGW100 + bool "Atmel NGW100" + select ADK_avr32 + select ADK_atmel_ngw100 + select ADK_CPU_AVR32 + select ADK_TARGET_KERNEL_UIMAGE + select ADK_HOST_BUILD_U_BOOT + help + ATMEL NGW100 + diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index 02b99a5c2..5e52c8283 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -66,4 +66,5 @@ config ADK_TARGET_KERNEL_MINICONFIG default "dragino-ms14s" if ADK_TARGET_SYSTEM_DRAGINO_MS14S default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC default "pcengines-apu" if ADK_TARGET_SYSTEM_PCENGINES_APU + default "atmel-ngw100" if ADK_TARGET_SYSTEM_ATMEL_NGW100 diff --git a/target/config/Config.in.target b/target/config/Config.in.target index f3bae0f8d..9cc227d9b 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -156,8 +156,10 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_KERNEL_IP_PNP select ADK_KERNEL_IP_PNP_DHCP select ADK_PACKAGE_ADKINSTALL - depends on !ADK_TARGET_QEMU && !ADK_TARGET_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K - depends on !ADK_TARGET_SYSTEM_ARM_FM + depends on !ADK_TARGET_QEMU && \ + !ADK_TARGET_VBOX && \ + !ADK_TARGET_SYSTEM_ARANYM_M68K && \ + !ADK_TARGET_SYSTEM_ARM_FM help Root filesystem mounted via NFS. (DHCP) |