From c0378f34c7f012b49fa8ca7507a1af78a90fc4c3 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sun, 19 Feb 2017 23:31:04 -0500 Subject: [PATCH] Removed u-boot omap and fixed luci-ssl collection --- package/boot/uboot-omap/Makefile | 103 ------------------ ...ream_image_c_fix_non_android_booting.patch | 33 ------ .../100-disable_thumb_unknown_errata.patch | 11 -- .../uboot-omap/patches/101-disable_ext.patch | 10 -- package/luci/collections/luci-ssl/Makefile | 2 +- 5 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 package/boot/uboot-omap/Makefile delete mode 100644 package/boot/uboot-omap/patches/001-backport_upstream_image_c_fix_non_android_booting.patch delete mode 100644 package/boot/uboot-omap/patches/100-disable_thumb_unknown_errata.patch delete mode 100644 package/boot/uboot-omap/patches/101-disable_ext.patch diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile deleted file mode 100644 index 8c4a54f5ac..0000000000 --- a/package/boot/uboot-omap/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# -# Copyright (C) 2012-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=u-boot -PKG_VERSION:=2015.10-librecmc -PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:= \ - https://librecmc.org/librecmc/downloads/sources/archive/ - -PKG_HASH:=35aa6ad931c9474578ae01c7b565753d9d28059bc4d5444eea923840342f1e86 - -PKG_LICENSE:=GPL-2.0 GPL-2.0+ -PKG_LICENSE_FILES:=Licenses/README - -include $(INCLUDE_DIR)/package.mk - -define uboot/Default - TITLE:= - CONFIG:= - IMAGE:= -endef - -define uboot/omap4_panda - TITLE:=U-Boot for the Pandaboard -endef - -define uboot/am335x_evm - TITLE:=U-Boot for the AM335x EVM -endef - -define uboot/omap3_overo - TITLE:=U-Boot for the Gumstix Overo -endef - -define uboot/omap3_beagle - TITLE:=U-Boot for the BeagleBoard -endef - -UBOOTS:=omap4_panda am335x_evm omap3_overo omap3_beagle - -define Package/uboot/template -define Package/uboot-omap-$(1) - SECTION:=boot - CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_omap - TITLE:=$(2) - URL:=http://www.denx.de/wiki/U-Boot - VARIANT:=$(1) - HIDDEN:=1 -endef -endef - -define BuildUBootPackage - $(eval $(uboot/Default)) - $(eval $(uboot/$(1))) - $(call Package/uboot/template,$(1),$(TITLE)) -endef - -ifdef BUILD_VARIANT -$(eval $(call uboot/$(BUILD_VARIANT))) -UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT)) -UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.img) -endif - -define Build/Configure - $(MAKE) -C $(PKG_BUILD_DIR) \ - USE_PRIVATE_LIBGCC=yes $(UBOOT_CONFIG)_config -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CROSS_COMPILE=$(TARGET_CROSS) -endef - -define Package/uboot/install/default - $(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1) - $(CP) $(PKG_BUILD_DIR)/u-boot.img $(BIN_DIR)/uboot-$(BOARD)-$(1)/u-boot.img - $(CP) $(PKG_BUILD_DIR)/MLO $(BIN_DIR)/uboot-$(BOARD)-$(1)/MLO -endef - -define Package/uboot/install/template -define Package/uboot-omap-$(1)/install - $(call Package/uboot/install/default,$(2)) -endef -endef - -$(foreach u,$(UBOOTS), \ - $(eval $(call Package/uboot/install/template,$(u),$(u))) \ -) - -$(foreach u,$(UBOOTS), \ - $(eval $(call BuildUBootPackage,$(u))) \ - $(eval $(call BuildPackage,uboot-omap-$(u))) \ -) diff --git a/package/boot/uboot-omap/patches/001-backport_upstream_image_c_fix_non_android_booting.patch b/package/boot/uboot-omap/patches/001-backport_upstream_image_c_fix_non_android_booting.patch deleted file mode 100644 index b8e65b5005..0000000000 --- a/package/boot/uboot-omap/patches/001-backport_upstream_image_c_fix_non_android_booting.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c139b5ff0999ec3d44a02ebdb623a92e5782e53e Mon Sep 17 00:00:00 2001 -From: Tom Rini -Date: Tue, 27 Oct 2015 19:04:40 -0400 -Subject: [PATCH] image.c: Fix non-Android booting with ramdisk and/or device - tree - -In 1fec3c5 I added a check that if we had an Android image we default to -trying the kernel address for a ramdisk. However when we don't have an -Android image buf is NULL and we oops here. Ensure that we have 'buf' -to check first. - -Reported-by: elipe Balbi -Signed-off-by: Tom Rini ---- - common/image.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/image.c b/common/image.c -index e607109..85c4f39 100644 ---- a/common/image.c -+++ b/common/image.c -@@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, - * Look for an Android boot image. - */ - buf = map_sysmem(images->os.start, 0); -- if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) -+ if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) - select = argv[0]; - #endif - --- -1.7.10.4 - diff --git a/package/boot/uboot-omap/patches/100-disable_thumb_unknown_errata.patch b/package/boot/uboot-omap/patches/100-disable_thumb_unknown_errata.patch deleted file mode 100644 index 7b7bfa8fbe..0000000000 --- a/package/boot/uboot-omap/patches/100-disable_thumb_unknown_errata.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/configs/ti_armv7_common.h -+++ b/include/configs/ti_armv7_common.h -@@ -233,8 +233,6 @@ - #define CONFIG_SPL_EXT_SUPPORT - #endif - --#define CONFIG_SYS_THUMB_BUILD -- - /* General parts of the framework, required. */ - #define CONFIG_SPL_I2C_SUPPORT - #define CONFIG_SPL_LIBCOMMON_SUPPORT diff --git a/package/boot/uboot-omap/patches/101-disable_ext.patch b/package/boot/uboot-omap/patches/101-disable_ext.patch deleted file mode 100644 index 9e0e47caf3..0000000000 --- a/package/boot/uboot-omap/patches/101-disable_ext.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/configs/ti_armv7_common.h -+++ b/include/configs/ti_armv7_common.h -@@ -230,7 +230,6 @@ - #define CONFIG_SPL_LIBDISK_SUPPORT - #define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_SPL_FAT_SUPPORT --#define CONFIG_SPL_EXT_SUPPORT - #endif - - /* General parts of the framework, required. */ diff --git a/package/luci/collections/luci-ssl/Makefile b/package/luci/collections/luci-ssl/Makefile index 8fb8ff4627..ad2acf7874 100644 --- a/package/luci/collections/luci-ssl/Makefile +++ b/package/luci/collections/luci-ssl/Makefile @@ -10,7 +10,7 @@ LUCI_TYPE:=col LUCI_BASENAME:=ssl LUCI_TITLE:=LuCI with HTTPS support (mbedTLS as SSL backend) -LUCI_DEPENDS:=+luci +libustream-mbedtls +px5g +LUCI_DEPENDS:=+luci +libustream-mbedtls +px5g-mbedtls include ../../luci.mk -- 2.25.1