Skip to content

Commit 3920f56

Browse files
fhunlethmobileoverlord
authored andcommitted
Remove autoboot patch
Autoboot can be set to -2 via a uboot.defconfig now so this patch isn't necessary anymore.
1 parent 6cd3c55 commit 3920f56

4 files changed

+23
-54
lines changed

uboot/0004-Add-MMC-environment-location.patch uboot/0003-Add-MMC-environment-location.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7c228db94ad150f622b6a7a248ba3033c5bfdd9b Mon Sep 17 00:00:00 2001
1+
From aa7db1990d4f1cd23cd55926d67a66f54d84c82b Mon Sep 17 00:00:00 2001
22
From: Frank Hunleth <[email protected]>
33
Date: Sun, 3 Jun 2018 11:33:53 -0400
44
Subject: [PATCH] Add MMC environment location
@@ -10,10 +10,10 @@ default BBB builds, so add it in.
1010
1 file changed, 3 insertions(+)
1111

1212
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
13-
index 13e6f53..0984697 100644
13+
index 5582a66..a5583da 100644
1414
--- a/include/configs/am335x_evm.h
1515
+++ b/include/configs/am335x_evm.h
16-
@@ -383,6 +383,9 @@
16+
@@ -380,6 +380,9 @@
1717
#define CONFIG_ENV_OFFSET 0x001c0000
1818
#define CONFIG_ENV_OFFSET_REDUND 0x001e0000
1919
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE

uboot/0003-autoboot.patch

-25
This file was deleted.

uboot/0005-Support-network-less-builds.patch uboot/0004-Support-network-less-builds.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7fc6d77de50c259e24e6861e42dbb4d0a935631a Mon Sep 17 00:00:00 2001
1+
From 975a950b028055ab0912551c3d8a9282f778ef65 Mon Sep 17 00:00:00 2001
22
From: Frank Hunleth <[email protected]>
33
Date: Sun, 3 Jun 2018 12:16:48 -0400
44
Subject: [PATCH] Support network-less builds
@@ -29,10 +29,10 @@ index b39656a..8df4173 100644
2929
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
3030
#ifdef CONFIG_TI_I2C_BOARD_DETECT
3131
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
32-
index 47698d2..766a90f 100644
32+
index a5583da..45a910d 100644
3333
--- a/include/configs/am335x_evm.h
3434
+++ b/include/configs/am335x_evm.h
35-
@@ -86,9 +86,7 @@
35+
@@ -83,9 +83,7 @@
3636
func(MMC, mmc, 0) \
3737
func(LEGACY_MMC, legacy_mmc, 0) \
3838
func(MMC, mmc, 1) \

uboot/0006-fs-add-support-for-SquashFS.patch uboot/0005-fs-add-support-for-SquashFS.patch

+17-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c021ee459c8788951522ca7e651473bf6ec2b043 Mon Sep 17 00:00:00 2001
1+
From 4c05d0e6ef10556f7abf1ad5b8a8e7ef2747b4b7 Mon Sep 17 00:00:00 2001
22
From: Frank Hunleth <[email protected]>
33
Date: Tue, 5 Jun 2018 09:10:14 -0400
44
Subject: [PATCH] fs: add support for SquashFS
@@ -29,19 +29,19 @@ comes from BareBox. It has the current limitations:
2929
fs/squashfs/namei.c | 346 ++++++++++++++++++++++
3030
fs/squashfs/page_actor.c | 99 +++++++
3131
fs/squashfs/page_actor.h | 52 ++++
32-
fs/squashfs/squashfs.c | 399 ++++++++++++++++++++++++++
32+
fs/squashfs/squashfs.c | 392 +++++++++++++++++++++++++
3333
fs/squashfs/squashfs.h | 123 ++++++++
3434
fs/squashfs/squashfs_compat.h | 590 ++++++++++++++++++++++++++++++++++++++
3535
fs/squashfs/squashfs_fs.h | 456 +++++++++++++++++++++++++++++
3636
fs/squashfs/squashfs_fs_i.h | 52 ++++
3737
fs/squashfs/squashfs_fs_sb.h | 76 +++++
3838
fs/squashfs/super.c | 343 ++++++++++++++++++++++
3939
fs/squashfs/xz_wrapper.c | 190 ++++++++++++
40-
fs/squashfs/zlib_wrapper.c | 127 ++++++++
40+
fs/squashfs/zlib_wrapper.c | 128 +++++++++
4141
fs/squashfs/zstd_wrapper.c | 147 ++++++++++
4242
include/fs.h | 1 +
4343
include/squashfs.h | 22 ++
44-
32 files changed, 5365 insertions(+)
44+
32 files changed, 5359 insertions(+)
4545
create mode 100644 fs/squashfs/Kconfig
4646
create mode 100644 fs/squashfs/Makefile
4747
create mode 100644 fs/squashfs/block.c
@@ -3052,12 +3052,10 @@ index 0000000..08f4356
30523052
+#endif
30533053
diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c
30543054
new file mode 100644
3055-
index 0000000..8a4cdea
3055+
index 0000000..20eeb31
30563056
--- /dev/null
30573057
+++ b/fs/squashfs/squashfs.c
3058-
@@ -0,0 +1,399 @@
3059-
+//#define DEBUG
3060-
+
3058+
@@ -0,0 +1,392 @@
30613059
+#include <linux/compat.h>
30623060
+
30633061
+#include <common.h>
@@ -3085,25 +3083,20 @@ index 0000000..8a4cdea
30853083
+char *squashfs_devread(struct squashfs_sb_info *fs, int address,
30863084
+ int byte_len)
30873085
+{
3088-
+ lbaint_t sector;
3089-
+ int byte_offset;
3090-
+ ssize_t size;
3086+
+ lbaint_t sector;
3087+
+ int byte_offset;
30913088
+ char *buf;
30923089
+
30933090
+ buf = malloc(byte_len);
30943091
+ if (buf == NULL)
30953092
+ return NULL;
30963093
+
3097-
+ sector = address >> cur_dev->log2blksz;
3098-
+ byte_offset = address % cur_dev->blksz;
3099-
+
3100-
+ size = fs_devread(cur_dev, &cur_part_info, sector, byte_offset,
3101-
+ byte_len, buf);
3094+
+ sector = address >> cur_dev->log2blksz;
3095+
+ byte_offset = address % cur_dev->blksz;
31023096
+
3103-
+ if (size < 0) {
3104-
+ debug("read error: %d\n", size);
3097+
+ if (!fs_devread(cur_dev, &cur_part_info, sector, byte_offset,
3098+
+ byte_len, buf))
31053099
+ return NULL;
3106-
+ }
31073100
+
31083101
+ return buf;
31093102
+}
@@ -5329,10 +5322,10 @@ index 0000000..6600f1e
53295322
+};
53305323
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
53315324
new file mode 100644
5332-
index 0000000..a992a05
5325+
index 0000000..7d6ca5f
53335326
--- /dev/null
53345327
+++ b/fs/squashfs/zlib_wrapper.c
5335-
@@ -0,0 +1,127 @@
5328+
@@ -0,0 +1,128 @@
53365329
+/*
53375330
+ * Squashfs - a compressed read only filesystem for Linux
53385331
+ *
@@ -5368,11 +5361,12 @@ index 0000000..a992a05
53685361
+
53695362
+static void *zlib_init(struct squashfs_sb_info *dummy, void *buff)
53705363
+{
5371-
+ z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
5364+
+ z_stream *stream = calloc(sizeof(z_stream), 1);
53725365
+ if (stream == NULL)
53735366
+ goto failed;
5374-
+ memset(stream, 0, sizeof(z_stream));
53755367
+
5368+
+ stream->zalloc = gzalloc;
5369+
+ stream->zfree = gzfree;
53765370
+ return stream;
53775371
+
53785372
+failed:

0 commit comments

Comments
 (0)