OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 From: Felix Fietkau <nbd@nbd.name> 1 From: Felix Fietkau <nbd@nbd.name>
2 Subject: Upgrade to Linux 2.6.19 2 Subject: Upgrade to Linux 2.6.19
3   3  
4 - Includes large parts of the patch from #1021 by dpalffy 4 - Includes large parts of the patch from #1021 by dpalffy
5 - Includes RB532 NAND driver changes by n0-1 5 - Includes RB532 NAND driver changes by n0-1
6   6  
7 [john@phrozen.org: feix will add this to his upstream queue] 7 [john@phrozen.org: feix will add this to his upstream queue]
8   8  
9 lede-commit: bff468813f78f81e36ebb2a3f4354de7365e640f 9 lede-commit: bff468813f78f81e36ebb2a3f4354de7365e640f
10 Signed-off-by: Felix Fietkau <nbd@nbd.name> 10 Signed-off-by: Felix Fietkau <nbd@nbd.name>
11 --- 11 ---
12 Makefile | 6 +++--- 12 Makefile | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-) 13 1 file changed, 3 insertions(+), 3 deletions(-)
14   14  
15 --- a/Makefile 15 --- a/Makefile
16 +++ b/Makefile 16 +++ b/Makefile
17 @@ -654,12 +654,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni 17 @@ -646,12 +646,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
18 18
19 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE 19 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
20 KBUILD_CFLAGS += $(call cc-option,-Oz,-Os) 20 KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
21 -KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) 21 -KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
22 +KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) 22 +KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
23 else 23 else
24 ifdef CONFIG_PROFILE_ALL_BRANCHES 24 ifdef CONFIG_PROFILE_ALL_BRANCHES
25 -KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) 25 -KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
26 +KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) 26 +KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
27 else 27 else
28 -KBUILD_CFLAGS += -O2 28 -KBUILD_CFLAGS += -O2
29 +KBUILD_CFLAGS += -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION) 29 +KBUILD_CFLAGS += -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
30 endif 30 endif
31 endif 31 endif
32 32
33   33