diff options
-rw-r--r--[-rwxr-xr-x] | fip/g12a/bl2.bin | bin | 52992 -> 52480 bytes | |||
-rw-r--r-- | fs/cramfs/cramfs.c | 2 | ||||
-rw-r--r-- | include/configs/odroid-g12-common.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/fip/g12a/bl2.bin b/fip/g12a/bl2.bin Binary files differindex e0ebc54239..dbf41ca0f1 100755..100644 --- a/fip/g12a/bl2.bin +++ b/fip/g12a/bl2.bin 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 |