From cd75afe5448c6255a7e68e3d12364166c3a5f301 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Fri, 21 Aug 2020 23:29:58 +0800
Subject: [PATCH] update zbar build shell script
---
linux-bsp/patches/u-boot-2010.09-fl2440.patch | 87 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/linux-bsp/patches/u-boot-2010.09-fl2440.patch b/linux-bsp/patches/u-boot-2010.09-fl2440.patch
index 50de68b..604e744 100644
--- a/linux-bsp/patches/u-boot-2010.09-fl2440.patch
+++ b/linux-bsp/patches/u-boot-2010.09-fl2440.patch
@@ -1,6 +1,6 @@
diff -Nuar u-boot-2010.09/arch/arm/cpu/arm920t/s3c24x0/speed.c u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/s3c24x0/speed.c
--- u-boot-2010.09/arch/arm/cpu/arm920t/s3c24x0/speed.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/s3c24x0/speed.c 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/s3c24x0/speed.c 2020-08-21 12:06:35.008546938 +0800
@@ -64,6 +64,11 @@
p = ((r & 0x003F0) >> 4) + 2;
s = r & 0x3;
@@ -56,7 +56,7 @@
#endif /* CONFIG_S3C24X0 */
diff -Nuar u-boot-2010.09/arch/arm/cpu/arm920t/s3c24x0/timer.c u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/s3c24x0/timer.c
--- u-boot-2010.09/arch/arm/cpu/arm920t/s3c24x0/timer.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/s3c24x0/timer.c 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/s3c24x0/timer.c 2020-08-21 12:06:35.008546938 +0800
@@ -181,6 +181,7 @@
tbclk = timer_load_val * 100;
#elif defined(CONFIG_SBC2410X) || \
@@ -67,7 +67,7 @@
#else
diff -Nuar u-boot-2010.09/arch/arm/cpu/arm920t/start.S u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/start.S
--- u-boot-2010.09/arch/arm/cpu/arm920t/start.S 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/start.S 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/start.S 2020-08-21 12:06:35.012546938 +0800
@@ -114,8 +114,8 @@
orr r0, r0, #0xd3
msr cpsr, r0
@@ -261,7 +261,7 @@
*************************************************************************
diff -Nuar u-boot-2010.09/arch/arm/cpu/arm920t/u-boot.lds u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/u-boot.lds
--- u-boot-2010.09/arch/arm/cpu/arm920t/u-boot.lds 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/u-boot.lds 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/arch/arm/cpu/arm920t/u-boot.lds 2020-08-21 12:06:35.012546938 +0800
@@ -40,6 +40,8 @@
.text :
{
@@ -273,7 +273,7 @@
diff -Nuar u-boot-2010.09/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h u-boot-2010.09-fl2440/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h
--- u-boot-2010.09/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h 2020-08-21 12:06:35.012546938 +0800
@@ -20,7 +20,7 @@
#ifdef CONFIG_S3C2400
@@ -285,7 +285,7 @@
#error Please define the s3c24x0 cpu type
diff -Nuar u-boot-2010.09/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h u-boot-2010.09-fl2440/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
--- u-boot-2010.09/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h 2020-08-21 12:06:35.012546938 +0800
@@ -78,7 +78,7 @@
u32 PRIORITY;
u32 INTPND;
@@ -397,7 +397,7 @@
diff -Nuar u-boot-2010.09/board/lingyun/fl2440/config.mk u-boot-2010.09-fl2440/board/lingyun/fl2440/config.mk
--- u-boot-2010.09/board/lingyun/fl2440/config.mk 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/board/lingyun/fl2440/config.mk 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/board/lingyun/fl2440/config.mk 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,25 @@
+#
+# (C) Copyright 2002
@@ -426,7 +426,7 @@
+TEXT_BASE = 0x33F80000
diff -Nuar u-boot-2010.09/board/lingyun/fl2440/fl2440.c u-boot-2010.09-fl2440/board/lingyun/fl2440/fl2440.c
--- u-boot-2010.09/board/lingyun/fl2440/fl2440.c 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/board/lingyun/fl2440/fl2440.c 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/board/lingyun/fl2440/fl2440.c 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,174 @@
+/*
+ * (C) Copyright 2002
@@ -604,7 +604,7 @@
+#endif
diff -Nuar u-boot-2010.09/board/lingyun/fl2440/flash.c u-boot-2010.09-fl2440/board/lingyun/fl2440/flash.c
--- u-boot-2010.09/board/lingyun/fl2440/flash.c 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/board/lingyun/fl2440/flash.c 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/board/lingyun/fl2440/flash.c 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,433 @@
+/*
+ * (C) Copyright 2002
@@ -1041,7 +1041,7 @@
+}
diff -Nuar u-boot-2010.09/board/lingyun/fl2440/lowlevel_init.S u-boot-2010.09-fl2440/board/lingyun/fl2440/lowlevel_init.S
--- u-boot-2010.09/board/lingyun/fl2440/lowlevel_init.S 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/board/lingyun/fl2440/lowlevel_init.S 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/board/lingyun/fl2440/lowlevel_init.S 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,198 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
@@ -1243,7 +1243,7 @@
+ .word 0x30
diff -Nuar u-boot-2010.09/board/lingyun/fl2440/Makefile u-boot-2010.09-fl2440/board/lingyun/fl2440/Makefile
--- u-boot-2010.09/board/lingyun/fl2440/Makefile 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/board/lingyun/fl2440/Makefile 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/board/lingyun/fl2440/Makefile 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2000-2006
@@ -1298,7 +1298,7 @@
+#########################################################################
diff -Nuar u-boot-2010.09/board/lingyun/fl2440/nand_read.c u-boot-2010.09-fl2440/board/lingyun/fl2440/nand_read.c
--- u-boot-2010.09/board/lingyun/fl2440/nand_read.c 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/board/lingyun/fl2440/nand_read.c 2020-01-09 17:22:17.705412170 +0800
++++ u-boot-2010.09-fl2440/board/lingyun/fl2440/nand_read.c 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,212 @@
+/*
+ * nand_read.c: Simple NAND read functions for booting from NAND
@@ -1514,7 +1514,7 @@
+}
diff -Nuar u-boot-2010.09/boards.cfg u-boot-2010.09-fl2440/boards.cfg
--- u-boot-2010.09/boards.cfg 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/boards.cfg 2020-01-09 17:22:17.709412170 +0800
++++ u-boot-2010.09-fl2440/boards.cfg 2020-08-21 12:06:35.012546938 +0800
@@ -238,6 +238,7 @@
sbc2410x arm arm920t - - s3c24x0
smdk2400 arm arm920t - samsung s3c24x0
@@ -1525,7 +1525,7 @@
afeb9260 arm arm926ejs - - at91
diff -Nuar u-boot-2010.09/build.sh u-boot-2010.09-fl2440/build.sh
--- u-boot-2010.09/build.sh 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/build.sh 2020-01-09 17:25:25.785415778 +0800
++++ u-boot-2010.09-fl2440/build.sh 2020-08-21 12:06:35.012546938 +0800
@@ -0,0 +1,72 @@
+#!/bin/bash
+
@@ -1601,7 +1601,7 @@
+
diff -Nuar u-boot-2010.09/common/cmd_nand.c u-boot-2010.09-fl2440/common/cmd_nand.c
--- u-boot-2010.09/common/cmd_nand.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/common/cmd_nand.c 2020-01-09 17:22:17.709412170 +0800
++++ u-boot-2010.09-fl2440/common/cmd_nand.c 2020-08-21 12:06:35.012546938 +0800
@@ -148,6 +148,11 @@
#if defined(CONFIG_CMD_MTDPARTS)
out:
@@ -1616,8 +1616,15 @@
puts("whole chip\n");
diff -Nuar u-boot-2010.09/common/env_common.c u-boot-2010.09-fl2440/common/env_common.c
--- u-boot-2010.09/common/env_common.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/common/env_common.c 2020-01-09 17:22:17.709412170 +0800
-@@ -57,7 +57,34 @@
++++ u-boot-2010.09-fl2440/common/env_common.c 2020-08-21 12:06:35.016546939 +0800
+@@ -53,11 +53,35 @@
+ #define MK_STR(x) XMK_STR(x)
+
+ uchar default_environment[] = {
++#ifdef CONFIG_DEVNAME /* Add by guowenxue, boardname */
++ "devname=" CONFIG_DEVNAME "\0"
++#endif
+ #ifdef CONFIG_BOOTARGS
"bootargs=" CONFIG_BOOTARGS "\0"
#endif
#ifdef CONFIG_BOOTCOMMAND
@@ -1627,15 +1634,12 @@
+#ifdef CONFIG_BBL_COMMAND /* Add by guowenxue, burn u-boot image */
+ "bbl=" CONFIG_BBL_COMMAND "\0"
+#endif
-+#ifdef CONFIG_BLX_COMMAND /* Add by guowenxue, burn linux kernel image */
-+ "blx=" CONFIG_BLX_COMMAND "\0"
++#ifdef CONFIG_BKR_COMMAND /* Add by guowenxue, burn linux kernel image */
++ "bkr=" CONFIG_BKR_COMMAND "\0"
+#endif
+#ifdef CONFIG_BURN_UBIFS /* Add by guowenxue, burn UBIFS root filesystem image */
-+ "bubifs=" CONFIG_BURN_UBIFS "\0"
++ "bfs=" CONFIG_BURN_UBIFS "\0"
+#endif
-+#ifdef CONFIG_BURN_JFFS2 /* Add by guowenxue, burn JFFS2 root filesystem image */
-+ "bjffs2=" CONFIG_BURN_JFFS2 "\0"
-+#endif
+#ifdef CONFIG_BSYS_COMMAND /* Add by guowenxue, burn linux kernel and rootfs */
+ "bsys=" CONFIG_BSYS_COMMAND "\0"
+#endif
@@ -1645,9 +1649,6 @@
+#ifdef CONFIG_BARGS_UBIFS /* Add by guowenxue, bootargs for ubifs rootfs */
+ "args_ubifs=" CONFIG_BARGS_UBIFS "\0"
+#endif
-+#ifdef CONFIG_BARGS_JFFS2 /* Add by guowenxue, bootargs for jffs2 rootfs */
-+ "args_jffs2=" CONFIG_BARGS_JFFS2 "\0"
-+#endif
+#ifdef CONFIG_TFTPBOOT_COMMAND /* Add by guowenxue, tftp boot linux system */
+ "tb=" CONFIG_TFTPBOOT_COMMAND "\0"
#endif
@@ -1655,7 +1656,7 @@
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -Nuar u-boot-2010.09/common/serial.c u-boot-2010.09-fl2440/common/serial.c
--- u-boot-2010.09/common/serial.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/common/serial.c 2020-01-09 17:22:17.709412170 +0800
++++ u-boot-2010.09-fl2440/common/serial.c 2020-08-21 12:06:35.016546939 +0800
@@ -68,7 +68,7 @@
#else
#error "Bad CONFIG_PSC_CONSOLE."
@@ -1676,7 +1677,7 @@
serial_register(&s3c24xx_serial2_device);
diff -Nuar u-boot-2010.09/drivers/mtd/nand/s3c2410_nand.c u-boot-2010.09-fl2440/drivers/mtd/nand/s3c2410_nand.c
--- u-boot-2010.09/drivers/mtd/nand/s3c2410_nand.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/drivers/mtd/nand/s3c2410_nand.c 2020-01-09 17:22:17.709412170 +0800
++++ u-boot-2010.09-fl2440/drivers/mtd/nand/s3c2410_nand.c 2020-08-21 12:06:35.016546939 +0800
@@ -24,6 +24,7 @@
#include <asm/arch/s3c24x0_cpu.h>
#include <asm/io.h>
@@ -1788,7 +1789,7 @@
diff -Nuar u-boot-2010.09/drivers/net/dm9000x.c u-boot-2010.09-fl2440/drivers/net/dm9000x.c
--- u-boot-2010.09/drivers/net/dm9000x.c 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/drivers/net/dm9000x.c 2020-01-09 17:22:17.709412170 +0800
++++ u-boot-2010.09-fl2440/drivers/net/dm9000x.c 2020-08-21 12:06:35.016546939 +0800
@@ -364,7 +364,7 @@
while (!(phy_read(1) & 0x20)) { /* autonegation complete bit */
udelay(1000);
@@ -1800,8 +1801,8 @@
}
diff -Nuar u-boot-2010.09/include/configs/fl2440.h u-boot-2010.09-fl2440/include/configs/fl2440.h
--- u-boot-2010.09/include/configs/fl2440.h 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-2010.09-fl2440/include/configs/fl2440.h 2020-01-09 17:22:17.709412170 +0800
-@@ -0,0 +1,239 @@
++++ u-boot-2010.09-fl2440/include/configs/fl2440.h 2020-08-21 12:06:35.016546939 +0800
+@@ -0,0 +1,237 @@
+/*
+ * (C) Copyright 2002
+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -1913,23 +1914,21 @@
+#define CONFIG_BOOTDELAY 2
+#define CONFIG_ETHADDR 08:00:3e:26:0a:5b
+#define CONFIG_NETMASK 255.255.255.0
-+#define CONFIG_IPADDR 192.168.2.168
-+#define CONFIG_SERVERIP 192.168.2.8
++#define CONFIG_IPADDR 192.168.2.128
++#define CONFIG_SERVERIP 192.168.2.2
+
+
-+#define CONFIG_BBL_COMMAND "tftp 30008000 u-boot-fl2440.bin;nand erase 0 100000;nand write 30008000 0 60000"
-+#define CONFIG_BLX_COMMAND "tftp 30008000 linuxrom-fl2440.bin;nand erase 100000 F00000;nand write 30008000 100000 D00000"
-+#define CONFIG_BSYS_COMMAND "run blx;run bubifs"
-+#define CONFIG_TFTPBOOT_COMMAND "tftp 30008000 linuxrom-fl2440.bin; bootm 30008000"
-+#define CONFIG_BURN_JFFS2 "tftp 30008000 rootfs-fl2440.jfs;nand erase 1000000 2800000;nand write 30008000 1000000 $filesize"
-+#define CONFIG_BURN_UBIFS "tftp 30008000 rootfs-fl2440.ubi;nand erase 1000000 2800000;nand write 30008000 1000000 $filesize"
-+
++#define CONFIG_DEVNAME "fl2440"
++#define CONFIG_BBL_COMMAND "tftp 30008000 u-boot-${devname}.bin;nand erase 0 100000;nand write 30008000 0 60000"
++#define CONFIG_BKR_COMMAND "tftp 30008000 linuxrom-fl2440.bin;nand erase 100000 F00000;nand write 30008000 100000 $filesize"
++#define CONFIG_BSYS_COMMAND "run bkr;run bfs"
++#define CONFIG_TFTPBOOT_COMMAND "tftp 30008000 linuxrom-${devname}.bin; bootm 30008000"
++#define CONFIG_BURN_UBIFS "tftp 30008000 rootfs-${devname}.ubi;nand erase 1000000 5000000;nand write 30008000 1000000 $filesize"
+
+#define CONFIG_BARGS_INITRAMFS "console=tty0 console=ttyS0,115200 mem=64M rw loglevel=7"
-+#define CONFIG_BARGS_JFFS2 "console=tty0 console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc mem=64M rw noinitrd loglevel=7"
+#define CONFIG_BARGS_UBIFS "console=tty0 console=ttyS0,115200 ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs mem=64M noinitrd rw loglevel=7"
+#define CONFIG_BOOTARGS CONFIG_BARGS_UBIFS
-+#define CONFIG_BOOTCOMMAND "nand read 30008000 100000 900000; bootm 30008000"
++#define CONFIG_BOOTCOMMAND "nand read 30008000 100000 300000; bootm 30008000"
+
+#if defined(CONFIG_CMD_KGDB)
+#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
@@ -2043,7 +2042,7 @@
+#endif /* __CONFIG_H */
diff -Nuar u-boot-2010.09/include/serial.h u-boot-2010.09-fl2440/include/serial.h
--- u-boot-2010.09/include/serial.h 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/include/serial.h 2020-01-09 17:22:17.709412170 +0800
++++ u-boot-2010.09-fl2440/include/serial.h 2020-08-21 12:06:35.016546939 +0800
@@ -46,7 +46,7 @@
extern struct serial_device serial6_device;
#endif
@@ -2055,7 +2054,7 @@
extern struct serial_device s3c24xx_serial2_device;
diff -Nuar u-boot-2010.09/Makefile u-boot-2010.09-fl2440/Makefile
--- u-boot-2010.09/Makefile 2010-09-29 05:20:55.000000000 +0800
-+++ u-boot-2010.09-fl2440/Makefile 2020-01-09 17:25:16.141415593 +0800
++++ u-boot-2010.09-fl2440/Makefile 2020-08-21 12:06:39.420547023 +0800
@@ -154,6 +154,8 @@
# load ARCH, BOARD, and CPU configuration
include $(obj)include/config.mk
--
Gitblit v1.9.1