From 561f9204e8d49949b0bd8f5e2ccece8a3637c99c Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 11 Oct 2021 19:52:07 +0800
Subject: [PATCH] fix kernel/timeconst.pl compile bug
---
linux-bsp/patches/linux-3.0-fl2440.patch | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/linux-bsp/patches/linux-3.0-fl2440.patch b/linux-bsp/patches/linux-3.0-fl2440.patch
index b5c016a..593b686 100644
--- a/linux-bsp/patches/linux-3.0-fl2440.patch
+++ b/linux-bsp/patches/linux-3.0-fl2440.patch
@@ -1,6 +1,6 @@
diff -Nuar -x .gitignore linux-3.0/arch/arm/mach-s3c2440/mach-smdk2440.c linux-3.0-fl2440/arch/arm/mach-s3c2440/mach-smdk2440.c
--- linux-3.0/arch/arm/mach-s3c2440/mach-smdk2440.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/arch/arm/mach-s3c2440/mach-smdk2440.c 2020-08-21 11:21:29.628495043 +0800
++++ linux-3.0-fl2440/arch/arm/mach-s3c2440/mach-smdk2440.c 2021-10-11 19:36:10.633297862 +0800
@@ -23,6 +23,14 @@
#include <linux/platform_device.h>
#include <linux/io.h>
@@ -274,7 +274,7 @@
smdk_machine_init();
diff -Nuar -x .gitignore linux-3.0/arch/arm/plat-s3c24xx/common-smdk.c linux-3.0-fl2440/arch/arm/plat-s3c24xx/common-smdk.c
--- linux-3.0/arch/arm/plat-s3c24xx/common-smdk.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/arch/arm/plat-s3c24xx/common-smdk.c 2020-08-21 10:37:03.244443895 +0800
++++ linux-3.0-fl2440/arch/arm/plat-s3c24xx/common-smdk.c 2021-10-11 19:36:10.633297862 +0800
@@ -48,107 +48,88 @@
/* LED devices */
@@ -444,7 +444,7 @@
void __init smdk_machine_init(void)
diff -Nuar -x .gitignore linux-3.0/arch/arm/plat-s3c24xx/devs.c linux-3.0-fl2440/arch/arm/plat-s3c24xx/devs.c
--- linux-3.0/arch/arm/plat-s3c24xx/devs.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/arch/arm/plat-s3c24xx/devs.c 2020-08-21 10:08:38.580411195 +0800
++++ linux-3.0-fl2440/arch/arm/plat-s3c24xx/devs.c 2021-10-11 19:36:10.633297862 +0800
@@ -299,6 +299,66 @@
EXPORT_SYMBOL(s3c_device_iis);
@@ -514,7 +514,7 @@
static struct resource s3c_rtc_resource[] = {
diff -Nuar -x .gitignore linux-3.0/arch/arm/plat-samsung/include/plat/devs.h linux-3.0-fl2440/arch/arm/plat-samsung/include/plat/devs.h
--- linux-3.0/arch/arm/plat-samsung/include/plat/devs.h 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/arch/arm/plat-samsung/include/plat/devs.h 2020-08-21 10:08:38.580411195 +0800
++++ linux-3.0-fl2440/arch/arm/plat-samsung/include/plat/devs.h 2021-10-11 19:36:10.633297862 +0800
@@ -93,6 +93,10 @@
extern struct platform_device s3c_device_usb_hsudc;
extern struct platform_device s3c_device_usb_hsotg;
@@ -528,7 +528,7 @@
extern struct platform_device s5pv210_device_pcm1;
diff -Nuar -x .gitignore linux-3.0/arch/arm/tools/mach-types linux-3.0-fl2440/arch/arm/tools/mach-types
--- linux-3.0/arch/arm/tools/mach-types 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/arch/arm/tools/mach-types 2020-08-21 10:08:38.580411195 +0800
++++ linux-3.0-fl2440/arch/arm/tools/mach-types 2021-10-11 19:36:10.633297862 +0800
@@ -85,7 +85,8 @@
bast ARCH_BAST BAST 331
h1940 ARCH_H1940 H1940 347
@@ -551,7 +551,7 @@
cpuat9g20 MACH_CPUAT9G20 CPUAT9G20 2031
diff -Nuar -x .gitignore linux-3.0/build.sh linux-3.0-fl2440/build.sh
--- linux-3.0/build.sh 1970-01-01 08:00:00.000000000 +0800
-+++ linux-3.0-fl2440/build.sh 2020-08-21 10:08:38.580411195 +0800
++++ linux-3.0-fl2440/build.sh 2021-10-11 19:36:10.633297862 +0800
@@ -0,0 +1,82 @@
+#!/bin/bash
+
@@ -637,7 +637,7 @@
+
diff -Nuar -x .gitignore linux-3.0/.cfg-fl2440 linux-3.0-fl2440/.cfg-fl2440
--- linux-3.0/.cfg-fl2440 1970-01-01 08:00:00.000000000 +0800
-+++ linux-3.0-fl2440/.cfg-fl2440 2020-08-21 11:26:22.344500658 +0800
++++ linux-3.0-fl2440/.cfg-fl2440 2021-10-11 19:44:13.553551935 +0800
@@ -0,0 +1,2407 @@
+#
+# Automatically generated make config: don't edit
@@ -3048,7 +3048,7 @@
+CONFIG_AVERAGE=y
diff -Nuar -x .gitignore linux-3.0/drivers/input/touchscreen/s3c2410_ts.c linux-3.0-fl2440/drivers/input/touchscreen/s3c2410_ts.c
--- linux-3.0/drivers/input/touchscreen/s3c2410_ts.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/input/touchscreen/s3c2410_ts.c 2020-08-21 10:08:38.584411195 +0800
++++ linux-3.0-fl2440/drivers/input/touchscreen/s3c2410_ts.c 2021-10-11 19:36:10.637297688 +0800
@@ -126,6 +126,7 @@
input_report_abs(ts.input, ABS_Y, ts.yp);
@@ -3080,7 +3080,7 @@
ts.input->id.bustype = BUS_HOST;
diff -Nuar -x .gitignore linux-3.0/drivers/mmc/host/s3cmci.c linux-3.0-fl2440/drivers/mmc/host/s3cmci.c
--- linux-3.0/drivers/mmc/host/s3cmci.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/mmc/host/s3cmci.c 2020-08-21 10:08:38.584411195 +0800
++++ linux-3.0-fl2440/drivers/mmc/host/s3cmci.c 2021-10-11 19:36:10.637297688 +0800
@@ -1275,6 +1275,7 @@
writel(mci_con, host->base + S3C2410_SDICON);
@@ -3118,7 +3118,7 @@
#ifdef CONFIG_CPU_FREQ
diff -Nuar -x .gitignore linux-3.0/drivers/net/dm9000.c linux-3.0-fl2440/drivers/net/dm9000.c
--- linux-3.0/drivers/net/dm9000.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/net/dm9000.c 2020-08-21 10:08:38.584411195 +0800
++++ linux-3.0-fl2440/drivers/net/dm9000.c 2021-10-11 19:36:10.637297688 +0800
@@ -39,6 +39,10 @@
#include <asm/irq.h>
#include <asm/io.h>
@@ -3146,7 +3146,7 @@
dev_dbg(db->dev, "enabling %s\n", dev->name);
diff -Nuar -x .gitignore linux-3.0/drivers/tty/serial/samsung.c linux-3.0-fl2440/drivers/tty/serial/samsung.c
--- linux-3.0/drivers/tty/serial/samsung.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/tty/serial/samsung.c 2020-08-21 10:08:38.584411195 +0800
++++ linux-3.0-fl2440/drivers/tty/serial/samsung.c 2021-10-11 19:36:10.637297688 +0800
@@ -54,7 +54,7 @@
/* UART name and device definitions */
@@ -3167,7 +3167,7 @@
.dev_name = S3C24XX_SERIAL_NAME,
diff -Nuar -x .gitignore linux-3.0/drivers/tty/vt/vt.c linux-3.0-fl2440/drivers/tty/vt/vt.c
--- linux-3.0/drivers/tty/vt/vt.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/tty/vt/vt.c 2020-08-21 10:08:38.628411196 +0800
++++ linux-3.0-fl2440/drivers/tty/vt/vt.c 2021-10-11 19:36:10.637297688 +0800
@@ -3843,12 +3843,14 @@
*/
static void blank_screen_t(unsigned long dummy)
@@ -3185,7 +3185,7 @@
void poke_blanked_console(void)
diff -Nuar -x .gitignore linux-3.0/drivers/usb/host/ohci-s3c2410.c linux-3.0-fl2440/drivers/usb/host/ohci-s3c2410.c
--- linux-3.0/drivers/usb/host/ohci-s3c2410.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/usb/host/ohci-s3c2410.c 2020-08-21 10:08:38.628411196 +0800
++++ linux-3.0-fl2440/drivers/usb/host/ohci-s3c2410.c 2021-10-11 19:36:10.637297688 +0800
@@ -22,6 +22,7 @@
#include <linux/platform_device.h>
#include <linux/clk.h>
@@ -3212,7 +3212,7 @@
clk_enable(usb_clk);
diff -Nuar -x .gitignore linux-3.0/drivers/usb/serial/Kconfig linux-3.0-fl2440/drivers/usb/serial/Kconfig
--- linux-3.0/drivers/usb/serial/Kconfig 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/usb/serial/Kconfig 2020-08-21 10:08:38.628411196 +0800
++++ linux-3.0-fl2440/drivers/usb/serial/Kconfig 2021-10-11 19:36:10.637297688 +0800
@@ -588,7 +588,8 @@
module will be called keyspan_pda.
@@ -3225,7 +3225,7 @@
tristate "USB driver for GSM and CDMA modems"
diff -Nuar -x .gitignore linux-3.0/drivers/usb/serial/option.c linux-3.0-fl2440/drivers/usb/serial/option.c
--- linux-3.0/drivers/usb/serial/option.c 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/drivers/usb/serial/option.c 2020-08-21 10:08:38.628411196 +0800
++++ linux-3.0-fl2440/drivers/usb/serial/option.c 2021-10-11 19:36:10.637297688 +0800
@@ -51,6 +51,13 @@
static void option_instat_callback(struct urb *urb);
@@ -3287,9 +3287,21 @@
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_VERSION(DRIVER_VERSION);
+diff -Nuar -x .gitignore linux-3.0/kernel/timeconst.pl linux-3.0-fl2440/kernel/timeconst.pl
+--- linux-3.0/kernel/timeconst.pl 2011-07-22 10:17:23.000000000 +0800
++++ linux-3.0-fl2440/kernel/timeconst.pl 2021-10-11 19:40:40.163414551 +0800
+@@ -370,7 +370,7 @@
+ }
+
+ @val = @{$canned_values{$hz}};
+- if (!defined(@val)) {
++ if (!@val) {
+ @val = compute_values($hz);
+ }
+ output($hz, @val);
diff -Nuar -x .gitignore linux-3.0/Makefile linux-3.0-fl2440/Makefile
--- linux-3.0/Makefile 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/Makefile 2020-08-21 11:21:30.996495069 +0800
++++ linux-3.0-fl2440/Makefile 2021-10-11 19:36:10.709294547 +0800
@@ -144,7 +144,7 @@
# but instead _all depend on modules
PHONY += all
@@ -3329,7 +3341,7 @@
# Packaging of the kernel to various formats
diff -Nuar -x .gitignore linux-3.0/net/wireless/db.txt linux-3.0-fl2440/net/wireless/db.txt
--- linux-3.0/net/wireless/db.txt 2011-07-22 10:17:23.000000000 +0800
-+++ linux-3.0-fl2440/net/wireless/db.txt 2020-08-21 10:08:38.628411196 +0800
++++ linux-3.0-fl2440/net/wireless/db.txt 2021-10-11 19:36:10.637297688 +0800
@@ -1,17 +1,793 @@
-#
-# This file is a placeholder to prevent accidental build breakage if someone
--
Gitblit v1.9.1