Skip to content

GitLab

U
u-boot
Commit 165bd65a authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed patch of sunxi-common.h

parent 3ee028b7
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 16 deletions
u-boot-2020.04-mender.patch
View file @ 165bd65a
diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p212_defconfig diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p212_defconfig
--- u-boot-2020.04/configs/p212_defconfig 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/configs/p212_defconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/configs/p212_defconfig 2020-06-06 18:51:53.318459521 +0930 +++ u-boot-2020.04-mender/configs/p212_defconfig 2020-07-24 12:05:58.751487092 +0930
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MESON=y CONFIG_ARCH_MESON=y
...@@ -12,7 +12,7 @@ diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p2 ...@@ -12,7 +12,7 @@ diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p2
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/rpi_3_defconfig diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/rpi_3_defconfig
--- u-boot-2020.04/configs/rpi_3_defconfig 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/configs/rpi_3_defconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/configs/rpi_3_defconfig 2020-06-06 18:51:53.319459525 +0930 +++ u-boot-2020.04-mender/configs/rpi_3_defconfig 2020-07-24 12:05:58.751487092 +0930
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_SYS_TEXT_BASE=0x00080000
CONFIG_TARGET_RPI_3=y CONFIG_TARGET_RPI_3=y
...@@ -24,7 +24,7 @@ diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/r ...@@ -24,7 +24,7 @@ diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/r
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
--- u-boot-2020.04/env/Kconfig 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/env/Kconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/env/Kconfig 2020-06-06 18:52:58.041670408 +0930 +++ u-boot-2020.04-mender/env/Kconfig 2020-07-24 12:05:58.751487092 +0930
@@ -488,25 +488,14 @@ @@ -488,25 +488,14 @@
environment location. environment location.
...@@ -57,7 +57,7 @@ diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig ...@@ -57,7 +57,7 @@ diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
environment location. environment location.
diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/include/config_mender_defines.h diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/include/config_mender_defines.h
--- u-boot-2020.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2020.04-mender/include/config_mender_defines.h 2020-06-06 18:51:53.320459528 +0930 +++ u-boot-2020.04-mender/include/config_mender_defines.h 2020-07-24 12:05:58.752487094 +0930
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* Shell variables */ +/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1 +#define MENDER_BOOT_PART_NUMBER 1
...@@ -78,7 +78,7 @@ diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/i ...@@ -78,7 +78,7 @@ diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/i
+#define MENDER_BOOTENV_SIZE 0x20000 +#define MENDER_BOOTENV_SIZE 0x20000
diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/config_mender.h diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/config_mender.h
--- u-boot-2020.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2020.04-mender/include/config_mender.h 2020-06-06 18:51:53.320459528 +0930 +++ u-boot-2020.04-mender/include/config_mender.h 2020-07-24 12:05:58.752487094 +0930
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -165,7 +165,7 @@ diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/c ...@@ -165,7 +165,7 @@ diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/c
+#endif /* HEADER_CONFIG_MENDER_H */ +#endif /* HEADER_CONFIG_MENDER_H */
diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include/configs/meson64.h diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include/configs/meson64.h
--- u-boot-2020.04/include/configs/meson64.h 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/include/configs/meson64.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/configs/meson64.h 2020-06-06 18:51:53.320459528 +0930 +++ u-boot-2020.04-mender/include/configs/meson64.h 2020-07-24 12:05:58.752487094 +0930
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
#define CONFIG_CPU_ARMV8 #define CONFIG_CPU_ARMV8
...@@ -177,7 +177,7 @@ diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include ...@@ -177,7 +177,7 @@ diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/configs/rpi.h diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/configs/rpi.h
--- u-boot-2020.04/include/configs/rpi.h 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/include/configs/rpi.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/configs/rpi.h 2020-06-06 18:51:53.321459531 +0930 +++ u-boot-2020.04-mender/include/configs/rpi.h 2020-07-24 12:05:58.752487094 +0930
@@ -97,6 +97,8 @@ @@ -97,6 +97,8 @@
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
...@@ -189,7 +189,7 @@ diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/con ...@@ -189,7 +189,7 @@ diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/con
/* Shell */ /* Shell */
diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/configs/sun8i.h diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/configs/sun8i.h
--- u-boot-2020.04/include/configs/sun8i.h 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/include/configs/sun8i.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/configs/sun8i.h 2020-06-06 18:51:53.321459531 +0930 +++ u-boot-2020.04-mender/include/configs/sun8i.h 2020-07-24 12:05:58.752487094 +0930
@@ -17,4 +17,7 @@ @@ -17,4 +17,7 @@
*/ */
#include <configs/sunxi-common.h> #include <configs/sunxi-common.h>
...@@ -200,8 +200,8 @@ diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/c ...@@ -200,8 +200,8 @@ diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/c
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/include/configs/sunxi-common.h diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/include/configs/sunxi-common.h
--- u-boot-2020.04/include/configs/sunxi-common.h 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/include/configs/sunxi-common.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/configs/sunxi-common.h 2020-06-06 18:51:53.322459534 +0930 +++ u-boot-2020.04-mender/include/configs/sunxi-common.h 2020-07-24 12:11:10.614282053 +0930
@@ -134,15 +134,7 @@ @@ -134,13 +134,6 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000 #define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif #endif
...@@ -213,13 +213,11 @@ diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/in ...@@ -213,13 +213,11 @@ diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/in
-#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif -#endif
#define CONFIG_SYS_MMC_MAX_DEVICE 4 #define CONFIG_SYS_MMC_MAX_DEVICE 4
-#endif #endif
#ifndef CONFIG_MACH_SUN8I_V3S
/* 64MB of malloc() pool */
diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env_default.h diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env_default.h
--- u-boot-2020.04/include/env_default.h 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/include/env_default.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/env_default.h 2020-06-06 18:51:53.322459534 +0930 +++ u-boot-2020.04-mender/include/env_default.h 2020-07-24 12:05:58.752487094 +0930
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
#include <env_callback.h> #include <env_callback.h>
...@@ -248,7 +246,7 @@ diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env ...@@ -248,7 +246,7 @@ diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0" "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_mender.h diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_mender.h
--- u-boot-2020.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2020.04-mender/include/env_mender.h 2020-06-06 18:51:53.322459534 +0930 +++ u-boot-2020.04-mender/include/env_mender.h 2020-07-24 12:05:58.753487097 +0930
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -338,7 +336,7 @@ diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_ ...@@ -338,7 +336,7 @@ diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_
+#endif /* HEADER_ENV_MENDER_H */ +#endif /* HEADER_ENV_MENDER_H */
diff -uNr u-boot-2020.04/scripts/Makefile.autoconf u-boot-2020.04-mender/scripts/Makefile.autoconf diff -uNr u-boot-2020.04/scripts/Makefile.autoconf u-boot-2020.04-mender/scripts/Makefile.autoconf
--- u-boot-2020.04/scripts/Makefile.autoconf 2020-04-14 00:32:18.000000000 +0930 --- u-boot-2020.04/scripts/Makefile.autoconf 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/scripts/Makefile.autoconf 2020-06-06 18:51:53.322459534 +0930 +++ u-boot-2020.04-mender/scripts/Makefile.autoconf 2020-07-24 12:05:58.753487097 +0930
@@ -109,7 +109,8 @@ @@ -109,7 +109,8 @@
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \ echo \#include \<asm/config.h\>; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment