summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/simpleinit/Makefile1
-rw-r--r--package/u-boot-avr32/Makefile18
-rw-r--r--package/u-boot-h8300/Makefile25
-rw-r--r--package/u-boot/Makefile1
5 files changed, 18 insertions, 29 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 028fbdba6..9ed63b71f 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -584,7 +584,7 @@ config BUSYBOX_IPLINK
config BUSYBOX_FEATURE_IP_LINK_CAN
bool "ip link set type can"
- default y
+ default n
help
Configure CAN devices with "ip".
diff --git a/package/simpleinit/Makefile b/package/simpleinit/Makefile
index 4de28ba48..91fe5141f 100644
--- a/package/simpleinit/Makefile
+++ b/package/simpleinit/Makefile
@@ -20,6 +20,7 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
TARGET_CPPFLAGS+= -DCONFIG_USER_INIT_CONSOLE_SH
+TARGET_CFLAGS+= -Wno-incompatible-pointer-types
do-build:
PATH='$(HOST_PATH)' \
diff --git a/package/u-boot-avr32/Makefile b/package/u-boot-avr32/Makefile
index 2886ddd3c..ac2553467 100644
--- a/package/u-boot-avr32/Makefile
+++ b/package/u-boot-avr32/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_HASH:= c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
-HOST_BUILDDEP:= libressl-host dtc-host
-PKG_BUILDDEP:= u-boot-host
+HOST_BUILDDEP:= gnutls-host openssl-host dtc-host
+PKG_BUILDDEP:= u-boot-avr32-host
PKG_URL:= http://www.denx.de/wiki/U-Boot
PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/
@@ -73,20 +73,6 @@ ifneq ($(OS_FOR_BUILD),Darwin)
$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin
$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin
endif
-ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
- $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR)
-endif
-ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y)
- $(INSTALL_BIN) ./files/boot.script.clearfog $(FW_DIR)
-endif
-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/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile
index bfd0824df..cf39d0ae9 100644
--- a/package/u-boot-h8300/Makefile
+++ b/package/u-boot-h8300/Makefile
@@ -3,24 +3,25 @@
include $(ADK_TOPDIR)/rules.mk
-PKG_NAME:= u-boot
-# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a
-PKG_VERSION:= h8300
-PKG_GIT:= branch
+PKG_NAME:= u-boot-h8300
+PKG_VERSION:= 0.1
PKG_RELEASE:= 1
+PKG_HASH:= 65461cc0cab37251e2487c0f5d4ae34c7ca89767bdf790b9a863800206b83539
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
-HOST_BUILDDEP:= libressl-host dtc-host
+HOST_BUILDDEP:= openssl-host dtc-host
PKG_BUILDDEP:= u-boot-h8300-host
-PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git
+PKG_SITES:= https://distfiles.openadk.org/
PKG_SYSTEM_DEPENDS:= hitachi-edosk2674
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+
include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call HOST_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call HOST_template,U_BOOT_H8300,u-boot-h8300,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,U_BOOT_8300,u-boot-h8300,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
UBOOT:= u-boot.bin
@@ -37,7 +38,7 @@ host-build:
(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
-u-boot-hostinstall:
+u-boot-h8300-hostinstall:
$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
$(STAGING_HOST_DIR)/usr/bin
@@ -48,15 +49,15 @@ do-build:
(cd $(WRKBUILD) && env \
PATH='$(HOST_PATH)' \
CROSS_COMPILE='$(TARGET_CROSS)' \
- GCC_HONOUR_COPTS=s $(MAKE))
+ $(MAKE))
ifneq ($(OS_FOR_BUILD),Darwin)
(cd $(WRKBUILD) && env \
PATH='$(HOST_PATH)' \
CROSS_COMPILE='$(TARGET_CROSS)' \
- GCC_HONOUR_COPTS=s $(MAKE) env)
+ $(MAKE) env)
endif
-u-boot-install:
+u-boot-h8300-install:
$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
$(INSTALL_DIR) $(IDIR_U_BOOT)/etc
$(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 79ffd8a04..5162ada34 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -39,6 +39,7 @@ UBOOT:= u-boot.img
endif
ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y)
CONFIG:= Linksprite_pcDuino3_defconfig
+UBOOT:= u-boot-sunxi-with-spl.bin
endif
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
CONFIG:= rpi_defconfig