[package] busybox: fix hexdump segmentation fault with an empty leading format unit

[openwrt.git] / package / uboot-lantiq / patches / 100-ifx_targets.patch

diff --git a/package/uboot-lantiq/patches/100-ifx_targets.patch b/package/uboot-lantiq/patches/100-ifx_targets.patch
index da4cd48..dcd931c 100644 (file)
--- a/package/uboot-lantiq/patches/100-ifx_targets.patch
+++ b/package/uboot-lantiq/patches/100-ifx_targets.patch
@@ -1,6 +1,6 @@
 --- a/MAKEALL
 +++ b/MAKEALL
-@@ -709,6 +709,12 @@ LIST_arm="                        \
+@@ -730,6 +730,12 @@
  ## MIPS Systems               (default = big endian)
  #########################################################################
  
@@ -13,7 +13,7 @@
  LIST_mips4kc="                \
        incaip          \
        qemu_mips       \
-@@ -740,6 +746,7 @@ LIST_au1xx0="              \
+@@ -761,6 +767,7 @@
  "
  
  LIST_mips="           \
@@ -23,7 +23,7 @@
        ${LIST_au1xx0}  \
 --- a/Makefile
 +++ b/Makefile
-@@ -474,7 +474,7 @@ $(obj)include/autoconf.mk: $(obj)include
+@@ -447,7 +447,7 @@
        set -e ; \
        : Extract the config macros ; \
        $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \
@@ -32,7 +32,7 @@
        mv $@.tmp $@
  
  #########################################################################
-@@ -3354,7 +3354,7 @@ incaip_config: unconfig
+@@ -3370,7 +3370,7 @@
                { echo "#define CPU_CLOCK_RATE 150000000" >>$(obj)include/config.h ; \
                  $(XECHO) "... with 150MHz system clock" ; \
                }
@@ -41,7 +41,7 @@
  
  tb0229_config: unconfig
        @$(MKCONFIG) $(@:_config=) mips mips tb0229
-@@ -3395,6 +3395,50 @@ vct_platinumavc_onenand_small_config: un
+@@ -3411,6 +3411,53 @@
        @$(MKCONFIG) -a vct mips mips vct micronas
  
  #########################################################################
@@ -56,8 +56,9 @@
 +                      echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
 +                      $(XECHO) "... with ramboot configuration" ; \
 +              }
-+      @if [ "$(findstring _DDR,$@)" ] ; then \
++      @if [ "$(findstring _DDR,$@)" -a -z "$(findstring ramboot,$@)" ] ; then \
 +              echo "#define CONFIG_USE_DDR_RAM"  >>$(obj)include/config.h ; \
++              echo "#define CONFIG_BOOTSTRAP"  >>$(obj)include/config.h ; \
 +              DDR=$(subst DDR,,$(filter DDR%,$(subst _, ,$@))); \
 +              case "$${DDR}" in \
 +              111M|166M|e111M|e166M|promos400|samsung166|psc166) \
@@ -73,11 +74,13 @@
 +      @mkdir -p $(obj)board/infineon/easy50812
 +      @[ -z "$(findstring ramboot,$@)" ] || \
 +              { echo "TEXT_BASE = 0xA0400000" >$(obj)board/infineon/easy50812/config.tmp ; \
++                      echo "CONFIG_BOOTSTRAP = 0" >>$(obj)board/infineon/easy50812/config.tmp ; \
 +                      echo "#define CONFIG_SYS_RAMBOOT" >>$(obj)include/config.h ; \
 +                      $(XECHO) "... with ramboot configuration" ; \
 +              }
-+      @if [ "$(findstring _DDR,$@)" ] ; then \
++      @if [ "$(findstring _DDR,$@)" -a -z "$(findstring ramboot,$@)" ] ; then \
 +              echo "#define CONFIG_USE_DDR_RAM"  >>$(obj)include/config.h ; \
++              echo "#define CONFIG_BOOTSTRAP"  >>$(obj)include/config.h ; \
 +              DDR=$(subst DDR,,$(filter DDR%,$(subst _, ,$@))); \
 +              case "$${DDR}" in \
 +              111M|166M|e111M|e166M|promos400|samsung166|psc166) \
@@ -92,19 +95,9 @@
  ## MIPS32 AU1X00
  #########################################################################
  
---- a/drivers/serial/Makefile
-+++ b/drivers/serial/Makefile
-@@ -28,6 +28,7 @@ LIB  := $(obj)libserial.a
- COBJS-$(CONFIG_ARM_DCC) += arm_dcc.o
- COBJS-$(CONFIG_AT91RM9200_USART) += at91rm9200_usart.o
- COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
-+COBJS-$(CONFIG_IFX_ASC) += ifx_asc.o
- COBJS-$(CONFIG_MCFUART) += mcfuart.o
- COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
- COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
-@@ -41,6 +41,7 @@ COBJS-$(CONFIG_FEC_MXC) += fec_mxc.o
+@@ -43,6 +43,7 @@
  COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o
  COBJS-$(CONFIG_FTMAC100) += ftmac100.o
  COBJS-$(CONFIG_GRETH) += greth.o
@@ -112,17 +105,27 @@
  COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
  COBJS-$(CONFIG_KIRKWOOD_EGIGA) += kirkwood_egiga.o
  COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile
+@@ -28,6 +28,7 @@
+ COBJS-$(CONFIG_ARM_DCC) += arm_dcc.o
+ COBJS-$(CONFIG_AT91RM9200_USART) += at91rm9200_usart.o
+ COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
++COBJS-$(CONFIG_IFX_ASC) += ifx_asc.o
+ COBJS-$(CONFIG_MCFUART) += mcfuart.o
+ COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
+ COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
 --- a/include/netdev.h
 +++ b/include/netdev.h
-@@ -55,6 +55,7 @@ int fecmxc_initialize (bd_t *bis);
+@@ -57,6 +57,7 @@
  int ftmac100_initialize(bd_t *bits);
  int greth_initialize(bd_t *bis);
  void gt6426x_eth_initialize(bd_t *bis);
 +int ifx_etop_initialize(bd_t *bis);
  int inca_switch_initialize(bd_t *bis);
  int kirkwood_egiga_initialize(bd_t *bis);
- int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
-@@ -82,6 +83,7 @@ int uec_standard_init(bd_t *bis);
+ int lan91c96_initialize(u8 dev_num, int base_addr);
+@@ -85,6 +86,7 @@
  int uli526x_initialize(bd_t *bis);
  int sh_eth_initialize(bd_t *bis);
  int dm9000_initialize(bd_t *bis);