hdparm: Update to 9.55

[ipfire-2.x.git] / lfs / u-boot

diff --git a/lfs/u-boot b/lfs/u-boot
index 1552566e102243b5baa5c756038f342c5e2954ee..b3548c36c6f818b1f0491a3dba59ba2222b39e08 100644 (file)
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -75,6 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/U-Boot-v2-fs-fat-read-fix-fat16-ls-read-issue.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot-support-gcc-6.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot-c99-inline-fix.patch
+
+       cd $(DIR_APP)/include/linux && ln -s compiler-gcc6.h compiler-gcc7.h
+
        # Pandaboard
        -mkdir -pv /usr/share/u-boot/pandaboard
        cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_config
@@ -126,6 +132,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # config (uEnv.txt)
        cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+       # patch real Kernel version to uEnv.txt
+       sed -e "s/xxxKVERxxx/$(KVER)/g" -i /boot/uEnv.txt
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)