diff options
| author | Dongjin Kim <tobetter@gmail.com> | 2020-05-08 11:53:22 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@almond.hardkernel.com> | 2020-05-08 11:53:22 +0900 |
| commit | 2e4520f1a8d06310dbbe2cc73c04e2cdb109795e (patch) | |
| tree | 2c0894b6fc2195f71594f1613ae31cccd9cf2cdf | |
| parent | a6c4094e8459281faa82c7d7b37212d1a9da1d12 (diff) | |
| parent | 19f5ef51c2ca66867d1f5925c99516bf5c6f9499 (diff) | |
| download | u-boot-odroid-c1-2e4520f1a8d06310dbbe2cc73c04e2cdb109795e.tar.gz | |
Merge changes I44936bba,Ifd9a89ec into odroidg12-v2015.01
* changes:
g12a/g12b: cramfs: Support cramfs cmd.
cramfs: block pointers are 32 bits
| -rw-r--r-- | fs/cramfs/cramfs.c | 2 | ||||
| -rw-r--r-- | include/configs/odroid-g12-common.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index fd8e4ef31e..311ac4a5f7 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -162,7 +162,7 @@ static int cramfs_uncompress (unsigned long begin, unsigned long offset, unsigned long loadoffset) { struct cramfs_inode *inode = (struct cramfs_inode *) (begin + offset); - unsigned long *block_ptrs = (unsigned long *) + u32 *block_ptrs = (u32 *) (begin + (CRAMFS_GET_OFFSET (inode) << 2)); unsigned long curr_block = (CRAMFS_GET_OFFSET (inode) + (((CRAMFS_24 (inode->size)) + diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h index 4cd4187c87..0e31af51de 100644 --- a/include/configs/odroid-g12-common.h +++ b/include/configs/odroid-g12-common.h @@ -545,6 +545,8 @@ #define CONFIG_SYS_MEM_TOP_HIDE 0x08000000 /* hide 128MB for kernel reserve */ #define CONFIG_CMD_LOADB 1 #define CONFIG_SUPPORT_RAW_INITRD 1 +#define CONFIG_CMD_CRAMFS 1 +#define CONFIG_CRAMFS_CMDLINE 1 /* debug mode defines */ //#define CONFIG_DEBUG_MODE 1 |