DeviceTree: add support for initrd in the DT
PATCH 1/1 DeviceTree: add support for initrd in the DT
Add the initrd start and end address to the DT, code comes from u-boot. Use this addition on the ArchosG9 board as an example.
--- arch/arm/boards/archosg9/env/config | 1 + arch/arm/configs/archosg9_defconfig | 4 ++ arch/arm/configs/archosg9_xload_defconfig | 1 + arch/arm/lib/armlinux.c | 1 + common/oftree.c | 66 +++++++++++++++++++++++++++++++ include/of.h | 1 + 6 files changed, 74 insertions(+)
arch/arm/boards/archosg9/env/config +1 -0
@@ -1,3 +1,4 @@ global.bootm.image="${TARGET_ROOT}/boot/zImage" global.bootm.initrd="${TARGET_ROOT}/boot/initrd" +global.bootm.oftree="${TARGET_ROOT}/boot/omap4-archosg9.dtb" global.linux.bootargs.base="console=ttyO0,115200n8 root=/dev/ram0"
arch/arm/configs/archosg9_defconfig +4 -0
@@ -45,6 +45,9 @@ CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y CONFIG_CMD_BOOTM_AIMAGE=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y +CONFIG_CMD_OFTREE=y +CONFIG_CMD_OF_PROPERTY=y +CONFIG_CMD_OF_NODE=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_MAGICVAR=y
@@ -68,3 +71,4 @@ CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y CONFIG_FS_OMAP4_USBBOOT=y +CONFIG_OFDEVICE=y
arch/arm/configs/archosg9_xload_defconfig +1 -0
@@ -21,4 +21,5 @@ CONFIG_DRIVER_SERIAL_OMAP4_USBBOOT=y # CONFIG_SPI is not set # CONFIG_FS_RAMFS is not set # CONFIG_FS_DEVFS is not set +CONFIG_FS_FAT=y CONFIG_FS_OMAP4_USBBOOT=y
arch/arm/lib/armlinux.c +2 -0
@@ -266,6 +266,8 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,if (oftree) {printf ("booting Linux kernel with devicetree\n" ); +fdt_initrd (oftree, initrd_address, + initrd_address+initrd_size,1 ); params = oftree; }else {setup_tags (initrd_address, initrd_size, swap);
common/oftree.c +66 -0
72 lines not on this page · raw message
include/of.h +1 -0
@@ -18,6 +18,7 @@ void do_fixup_by_path(struct fdt_header *fdt, const char *path, const char *propvoid do_fixup_by_path_u32 (struct fdt_header *fdt,const char *path,const char *prop,u32 val,int create);int fdt_get_path_or_create (struct fdt_header *fdt,const char *path); +int fdt_initrd (void *fdt,ulong initrd_start,ulong initrd_end,int force);#define OF_BAD_ADDR ((u64)-1)
Signature · 7 lines
1.8.1.3 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 2 lines · Vicente Bergas
Add the initrd start and end address to the DT, code comes from u-boot. Use this addition on the ArchosG9 board as an example.
split it in 2 patch
Quoted 54 lines
Signed-off-by Vicente Bergas <[email protected]>--- arch/arm/boards/archosg9/env/config | 1 + arch/arm/configs/archosg9_defconfig | 4 ++ arch/arm/configs/archosg9_xload_defconfig | 1 + arch/arm/lib/armlinux.c | 1 + common/oftree.c | 66 +++++++++++++++++++++++++++++++ include/of.h | 1 + 6 files changed, 74 insertions(+)arch/arm/boards/archosg9/env/config +1
-0@@ -1,3 +1,4 @@ global.bootm.image="${TARGET_ROOT}/boot/zImage" global.bootm.initrd="${TARGET_ROOT}/boot/initrd" +global.bootm.oftree="${TARGET_ROOT}/boot/omap4-archosg9.dtb" global.linux.bootargs.base="console=ttyO0,115200n8 root=/dev/ram0"arch/arm/configs/archosg9_defconfig +4
-0@@ -45,6 +45,9 @@ CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y CONFIG_CMD_BOOTM_AIMAGE=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y +CONFIG_CMD_OFTREE=y +CONFIG_CMD_OF_PROPERTY=y +CONFIG_CMD_OF_NODE=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_MAGICVAR=y@@ -68,3 +71,4 @@ CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y CONFIG_FS_OMAP4_USBBOOT=y +CONFIG_OFDEVICE=yarch/arm/configs/archosg9_xload_defconfig +1
-0@@ -21,4 +21,5 @@ CONFIG_DRIVER_SERIAL_OMAP4_USBBOOT=y # CONFIG_SPI is not set # CONFIG_FS_RAMFS is not set # CONFIG_FS_DEVFS is not set +CONFIG_FS_FAT=y CONFIG_FS_OMAP4_USBBOOT=yarch/arm/lib/armlinux.c +0
-0
arch/arm/lib/armlinux.c void start_linux(void *adr, int swap, unsigned long initrd_address, · line 270
Quoted 5 lines
arch/arm/lib/armlinux.c +2
-0@@ -266,6 +266,8 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,if (oftree) {printf ("booting Linux kernel with devicetree\n" ); +fdt_initrd (oftree, initrd_address, + initrd_address+initrd_size,1 );
why you do not check the return?
Quoted 8 lines
arch/arm/lib/armlinux.c +0
-0params = oftree; }else {setup_tags (initrd_address, initrd_size, swap);common/oftree.c +0
-0
common/oftree.c int fdt_get_path_or_create(struct fdt_header *fdt, const char *path) · line 251
Quoted 6 lines
common/oftree.c +3
-0@@ -246,6 +246,72 @@ int fdt_get_path_or_create(struct fdt_header *fdt, const char *path)return nodeoffset; } +int fdt_initrd (void *fdt,ulong initrd_start,ulong initrd_end,int force) +{ +int nodeoffset;
use tab or 1 space
Quoted 30 lines
common/oftree.c +30
-0+int err, j, total; +u32 tmp; +const char *path; +uint64_t addr, size; + +/* Find the "chosen" node. */ + nodeoffset =fdt_path_offset (fdt,"/chosen" ); + +/* If there is no "chosen" node in the blob return */ +if (nodeoffset <0 ) { +printf ("fdt_initrd: %s\n" ,fdt_strerror (nodeoffset)); +return nodeoffset; + } + +/* just return if initrd_start/end aren't valid */ +if ((initrd_start ==0 ) || (initrd_end ==0 )) +return 0 ; + + total =fdt_num_mem_rsv (fdt); + +/* +* Look for an existing entry and update it. If we don't find +* the entry, we will j be the next available slot. +*/ +for (j =0 ; j < total; j++) { + err =fdt_get_mem_rsv (fdt, j, &addr, &size); +if (addr == initrd_start) { +fdt_del_mem_rsv (fdt, j); +break ; + }
common/oftree.c int fdt_get_path_or_create(struct fdt_header *fdt, const char *path) · line 291
Quoted 10 lines
common/oftree.c +10
-0+ } + + err =fdt_add_mem_rsv (fdt, initrd_start, initrd_end - initrd_start); +if (err <0 ) { +printf ("fdt_initrd: %s\n" ,fdt_strerror (err)); +return err; + } + + path =fdt_getprop (fdt, nodeoffset,"linux,initrd-start" ,NULL ); +if ((path ==NULL ) || force) {
!path
common/oftree.c int fdt_get_path_or_create(struct fdt_header *fdt, const char *path) · line 292
Quoted 1 line
common/oftree.c +1
-0+ tmp =__cpu_to_be32 (initrd_start);
why __cpu_to_be32
Quoted 45 lines
common/oftree.c +22
-0+ err =fdt_setprop (fdt, nodeoffset, +"linux,initrd-start" , &tmp,sizeof (tmp)); +if (err <0 ) { +printf ("WARNING: " +"could not set linux,initrd-start %s.\n" , +fdt_strerror (err)); +return err; + } + tmp =__cpu_to_be32 (initrd_end); + err =fdt_setprop (fdt, nodeoffset, +"linux,initrd-end" , &tmp,sizeof (tmp)); +if (err <0 ) { +printf ("WARNING: could not set linux,initrd-end %s.\n" , +fdt_strerror (err)); + +return err; + } + } + +return 0 ; +} +static int of_fixup_bootargs (struct fdt_header *fdt) {int nodeoffset;include/of.h +1
-0@@ -18,6 +18,7 @@ void do_fixup_by_path(struct fdt_header *fdt, const char *path, const char *propvoid do_fixup_by_path_u32 (struct fdt_header *fdt,const char *path,const char *prop,u32 val,int create);int fdt_get_path_or_create (struct fdt_header *fdt,const char *path); +int fdt_initrd (void *fdt,ulong initrd_start,ulong initrd_end,int force);#define OF_BAD_ADDR ((u64)-1)Signature · 7 lines
1.8.1.3 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox