From a3a71d430b762ca48c6030c92d268a86b9f9137d Mon Sep 17 00:00:00 2001 From: blogic Date: Tue, 16 Oct 2012 13:44:25 +0000 Subject: [boot] move boot related packages to their own folder git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33781 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/uboot-ar71xx/patches/001-ar71xx.patch | 28 ---------------------- package/uboot-ar71xx/patches/002-ar71xx-spi.patch | 11 --------- package/uboot-ar71xx/patches/010-enet-ag71xx.patch | 22 ----------------- .../patches/011-switch-rtl8366sr.patch | 28 ---------------------- .../uboot-ar71xx/patches/020-freebsd-compat.patch | 11 --------- .../uboot-ar71xx/patches/021-darwin_compat.patch | 23 ------------------ .../patches/022-getline_backport.patch | 21 ---------------- 7 files changed, 144 deletions(-) delete mode 100644 package/uboot-ar71xx/patches/001-ar71xx.patch delete mode 100644 package/uboot-ar71xx/patches/002-ar71xx-spi.patch delete mode 100644 package/uboot-ar71xx/patches/010-enet-ag71xx.patch delete mode 100644 package/uboot-ar71xx/patches/011-switch-rtl8366sr.patch delete mode 100644 package/uboot-ar71xx/patches/020-freebsd-compat.patch delete mode 100644 package/uboot-ar71xx/patches/021-darwin_compat.patch delete mode 100644 package/uboot-ar71xx/patches/022-getline_backport.patch (limited to 'package/uboot-ar71xx/patches') diff --git a/package/uboot-ar71xx/patches/001-ar71xx.patch b/package/uboot-ar71xx/patches/001-ar71xx.patch deleted file mode 100644 index 409f67a57..000000000 --- a/package/uboot-ar71xx/patches/001-ar71xx.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur u-boot-2010.03/cpu/mips/Makefile u-boot-nbg/cpu/mips/Makefile ---- u-boot-2010.03/cpu/mips/Makefile 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/cpu/mips/Makefile 2010-04-15 18:58:01.000000000 +0200 -@@ -33,6 +33,7 @@ - COBJS-$(CONFIG_INCA_IP) += asc_serial.o incaip_clock.o - COBJS-$(CONFIG_PURPLE) += asc_serial.o - COBJS-$(CONFIG_SOC_AU1X00) += au1x00_eth.o au1x00_serial.o au1x00_usb_ohci.o -+COBJS-$(CONFIG_AR71XX) += ar71xx_serial.o - - SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) - OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -diff -ur u-boot-2010.03/Makefile u-boot-nbg/Makefile ---- u-boot-2010.03/Makefile 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/Makefile 2010-04-11 23:31:29.000000000 +0200 -@@ -3455,6 +3455,13 @@ - @$(MKCONFIG) -a qemu-mips mips mips qemu-mips - - ######################################################################### -+## MIPS32 AR71XX (24K) -+######################################################################### -+ -+nbg460n_550n_550nh_config : unconfig -+ @$(MKCONFIG) -a nbg460n mips mips nbg460n zyxel -+ -+######################################################################### - ## MIPS64 5Kc - ######################################################################### - diff --git a/package/uboot-ar71xx/patches/002-ar71xx-spi.patch b/package/uboot-ar71xx/patches/002-ar71xx-spi.patch deleted file mode 100644 index 2bb1ba221..000000000 --- a/package/uboot-ar71xx/patches/002-ar71xx-spi.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur u-boot-2010.03/drivers/spi/Makefile u-boot-nbg/drivers/spi/Makefile ---- u-boot-2010.03/drivers/spi/Makefile 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/drivers/spi/Makefile 2010-04-15 19:31:27.000000000 +0200 -@@ -25,6 +25,7 @@ - - LIB := $(obj)libspi.a - -+COBJS-$(CONFIG_AR71XX_SPI) += ar71xx_spi.o - COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o - COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o - COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o diff --git a/package/uboot-ar71xx/patches/010-enet-ag71xx.patch b/package/uboot-ar71xx/patches/010-enet-ag71xx.patch deleted file mode 100644 index ee90e32c7..000000000 --- a/package/uboot-ar71xx/patches/010-enet-ag71xx.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur u-boot-2010.03/drivers/net/Makefile u-boot-nbg/drivers/net/Makefile ---- u-boot-2010.03/drivers/net/Makefile 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/drivers/net/Makefile 2010-04-19 23:30:01.000000000 +0200 -@@ -27,6 +27,7 @@ - - COBJS-$(CONFIG_DRIVER_3C589) += 3c589.o - COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o -+COBJS-$(CONFIG_AG71XX) += ag71xx.o - COBJS-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o - COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o - COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o -diff -ur u-boot-2010.03/include/netdev.h u-boot-nbg/include/netdev.h ---- u-boot-2010.03/include/netdev.h 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/include/netdev.h 2010-05-02 11:30:58.000000000 +0200 -@@ -42,6 +42,7 @@ - - /* Driver initialization prototypes */ - int au1x00_enet_initialize(bd_t*); -+int ag71xx_register(bd_t * bis, char *phyname[], u16 phyid[], u16 phyfixed[]); - int at91emac_register(bd_t *bis, unsigned long iobase); - int bfin_EMAC_initialize(bd_t *bis); - int cs8900_initialize(u8 dev_num, int base_addr); diff --git a/package/uboot-ar71xx/patches/011-switch-rtl8366sr.patch b/package/uboot-ar71xx/patches/011-switch-rtl8366sr.patch deleted file mode 100644 index 5d2ba41ea..000000000 --- a/package/uboot-ar71xx/patches/011-switch-rtl8366sr.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur u-boot-2010.03/drivers/net/Makefile u-boot-nbg/drivers/net/Makefile ---- u-boot-2010.03/drivers/net/Makefile 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/drivers/net/Makefile 2010-04-19 23:30:01.000000000 +0200 -@@ -65,6 +65,7 @@ - COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o - COBJS-$(CONFIG_RTL8139) += rtl8139.o - COBJS-$(CONFIG_RTL8169) += rtl8169.o -+COBJS-$(CONFIG_RTL8366_MII) += phy/rtl8366_mii.o - COBJS-$(CONFIG_DRIVER_S3C4510_ETH) += s3c4510b_eth.o - COBJS-$(CONFIG_SH_ETHER) += sh_eth.o - COBJS-$(CONFIG_SMC91111) += smc91111.o -diff -ur u-boot-2010.03/include/netdev.h u-boot-nbg/include/netdev.h ---- u-boot-2010.03/include/netdev.h 2010-03-31 23:54:39.000000000 +0200 -+++ u-boot-nbg/include/netdev.h 2010-05-02 11:30:58.000000000 +0200 -@@ -175,5 +175,13 @@ - - int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig); - #endif /* CONFIG_MV88E61XX_SWITCH */ -+ -+#if defined(CONFIG_RTL8366_MII) -+#define RTL8366_DEVNAME "rtl8366" -+#define RTL8366_WANPHY_ID 4 -+#define RTL8366_LANPHY_ID -1 -+int rtl8366_mii_register(bd_t *bis); -+int rtl8366s_initialize(void); -+#endif - - #endif /* _NETDEV_H_ */ diff --git a/package/uboot-ar71xx/patches/020-freebsd-compat.patch b/package/uboot-ar71xx/patches/020-freebsd-compat.patch deleted file mode 100644 index fee06699c..000000000 --- a/package/uboot-ar71xx/patches/020-freebsd-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/compiler.h -+++ b/include/compiler.h -@@ -46,7 +46,7 @@ extern int errno; - #ifdef __linux__ - # include - # include --#elif defined(__MACH__) -+#elif defined(__MACH__) || defined(__FreeBSD__) - # include - typedef unsigned long ulong; - typedef unsigned int uint; diff --git a/package/uboot-ar71xx/patches/021-darwin_compat.patch b/package/uboot-ar71xx/patches/021-darwin_compat.patch deleted file mode 100644 index dde83d490..000000000 --- a/package/uboot-ar71xx/patches/021-darwin_compat.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -64,9 +64,17 @@ HOSTSTRIP = strip - # - - ifeq ($(HOSTOS),darwin) --HOSTCC = cc --HOSTCFLAGS += -traditional-cpp --HOSTLDFLAGS += -multiply_defined suppress -+#get the major and minor product version (e.g. '10' and '6' for Snow Leopard) -+DARWIN_MAJOR_VERSION = $(shell sw_vers -productVersion | cut -f 1 -d '.') -+DARWIN_MINOR_VERSION = $(shell sw_vers -productVersion | cut -f 2 -d '.') -+ -+before-snow-leopard = $(shell if [ $(DARWIN_MAJOR_VERSION) -le 10 -a \ -+ $(DARWIN_MINOR_VERSION) -le 5 ] ; then echo "$(1)"; else echo "$(2)"; fi ;) -+ -+# Snow Leopards build environment has no longer restrictions as described above -+HOSTCC = $(call before-snow-leopard, "cc", "gcc") -+HOSTCFLAGS += $(call before-snow-leopard, "-traditional-cpp") -+HOSTLDFLAGS += $(call before-snow-leopard, "-multiply_defined suppress") - else - HOSTCC = gcc - endif diff --git a/package/uboot-ar71xx/patches/022-getline_backport.patch b/package/uboot-ar71xx/patches/022-getline_backport.patch deleted file mode 100644 index 2ce2b614b..000000000 --- a/package/uboot-ar71xx/patches/022-getline_backport.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/tools/os_support.c -+++ b/tools/os_support.c -@@ -23,6 +23,6 @@ - #ifdef __MINGW32__ - #include "mingw_support.c" - #endif --#ifdef __APPLE__ -+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L - #include "getline.c" - #endif ---- a/tools/os_support.h -+++ b/tools/os_support.h -@@ -28,7 +28,7 @@ - #include "mingw_support.h" - #endif - --#ifdef __APPLE__ -+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L - #include "getline.h" - #endif - -- cgit v1.2.3