From 589ab711a6a89bf0352aabc7a33673e5658803d9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 23 Mar 2009 13:30:30 +0000 Subject: u-boot: get rid of version specific patch dirs All those dirs seem a bit excessive for a single patch --- target/u-boot/1.2.0-atmel/.empty | 0 target/u-boot/1.3.4/.empty | 0 target/u-boot/2008.10/.empty | 0 target/u-boot/2009.01/.empty | 0 .../u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 | 13 ------------- target/u-boot/Makefile.in | 2 +- .../u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 | 13 +++++++++++++ 7 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 target/u-boot/1.2.0-atmel/.empty delete mode 100644 target/u-boot/1.3.4/.empty delete mode 100644 target/u-boot/2008.10/.empty delete mode 100644 target/u-boot/2009.01/.empty delete mode 100644 target/u-boot/2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 create mode 100644 target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 diff --git a/target/u-boot/1.2.0-atmel/.empty b/target/u-boot/1.2.0-atmel/.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/target/u-boot/1.3.4/.empty b/target/u-boot/1.3.4/.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/target/u-boot/2008.10/.empty b/target/u-boot/2008.10/.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/target/u-boot/2009.01/.empty b/target/u-boot/2009.01/.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/target/u-boot/2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 b/target/u-boot/2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 deleted file mode 100644 index 07cddb000..000000000 --- a/target/u-boot/2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN u-boot-2009.01-rc3/include/asm-avr32/io.h u-boot-avr32//include/asm-avr32/io.h ---- u-boot-2009.01-rc3/include/asm-avr32/io.h 2009-01-18 21:37:48.000000000 +0100 -+++ u-boot-avr32//include/asm-avr32/io.h 2009-01-22 07:14:38.000000000 +0100 -@@ -125,9 +125,4 @@ - - } - --static inline phys_addr_t virt_to_phys(void * vaddr) --{ -- return (phys_addr_t)(vaddr); --} -- - #endif /* __ASM_AVR32_IO_H */ diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in index be889a076..cd184045d 100644 --- a/target/u-boot/Makefile.in +++ b/target/u-boot/Makefile.in @@ -81,7 +81,7 @@ $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE) touch $@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked - toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/$(U_BOOT_VERSION) \ + toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \ u-boot-$(U_BOOT_VERSION)-\*.patch \ u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH) ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),) diff --git a/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 b/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 new file mode 100644 index 000000000..07cddb000 --- /dev/null +++ b/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 @@ -0,0 +1,13 @@ +diff -urN u-boot-2009.01-rc3/include/asm-avr32/io.h u-boot-avr32//include/asm-avr32/io.h +--- u-boot-2009.01-rc3/include/asm-avr32/io.h 2009-01-18 21:37:48.000000000 +0100 ++++ u-boot-avr32//include/asm-avr32/io.h 2009-01-22 07:14:38.000000000 +0100 +@@ -125,9 +125,4 @@ + + } + +-static inline phys_addr_t virt_to_phys(void * vaddr) +-{ +- return (phys_addr_t)(vaddr); +-} +- + #endif /* __ASM_AVR32_IO_H */ -- cgit v1.2.3