Skip to content

Commit

Permalink
Merge pull request #121 from YuzukiHD/main
Browse files Browse the repository at this point in the history
sync main forks
  • Loading branch information
SamulKyull authored Jul 9, 2024
2 parents 54bee29 + e6d8343 commit 23316e2
Show file tree
Hide file tree
Showing 9 changed files with 944 additions and 4 deletions.
4 changes: 3 additions & 1 deletion board/100ask-ros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ add_subdirectory(init_dram)

add_subdirectory(smhc_test)

add_subdirectory(syter_boot)
add_subdirectory(syter_boot)

add_subdirectory(extlinux_boot)
5 changes: 5 additions & 0 deletions board/100ask-ros/extlinux_boot/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-License-Identifier: Apache-2.0

add_syterkit_app(extlinux_boot
main.c
)
Binary file added board/100ask-ros/extlinux_boot/bl31/bl31.bin
Binary file not shown.
5 changes: 5 additions & 0 deletions board/100ask-ros/extlinux_boot/extlinux/extlinux.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
label Ubuntu-22.04
kernel /Image
initrd /initrd.img
fdt /sunxi.dtb
append earlycon=uart8250,mmio32,0x02500000 clk_ignore_unused initcall_debug=0 console=ttyAS0,115200 loglevel=8 root=/dev/mmcblk0p2 rootwait init=/init rdinit=/rdinit partitions=boot@mmcblk0p1:rootfs@mmcblk0p2:boot-resource@mmcblk0p3:env@mmcblk0p4:env-redund@mmcblk0p5:boottone@mmcblk0p6:rootfs_data@mmcblk0p7:private@mmcblk0p8:UDISK@mmcblk0p9 cma=64M snum=81275688b1c2489200e mac_addr= wifi_mac= bt_mac= selinux=0 specialstr= gpt=1 androidboot.mode=normal boot_type=2 gpt=1 uboot_message=2018 mbr_offset=1032192 bootreason=unknow
238 changes: 238 additions & 0 deletions board/100ask-ros/extlinux_boot/fdt.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
/* SPDX-License-Identifier: Apache-2.0 */

#ifdef SYTERKIT_CLI_CMD_FDT
msh_declare_command(fdt);
msh_define_help(fdt, "flattened device tree utility commands",
"fdt print <path> [<prop>] - Recursive print starting at <path>\n"
"fdt list <path> [<prop>] - Print one level starting at <path>\n"
"fdt set <path> <prop> [<val>] - Set <property> [to <val>]\n"
"fdt mknode <path> <node> - Create a new node after <path>\n"
"fdt rm <path> [<prop>] - Delete the node or <property>\n"
"fdt header - Display header info\n"
"fdt rsvmem print - Show current mem reserves\n"
"fdt rsvmem add <addr> <size> - Add a mem reserve\n"
"fdt rsvmem delete <index> - Delete a mem reserves\n"
"NOTE: Dereference aliases by omitting the leading '/', "
"e.g. fdt print ethernet0.\n\n");
int cmd_fdt(int argc, const char **argv) {
if (argc < 2) {
uart_puts(cmd_fdt_usage);
return 0;
}
if (strncmp(argv[1], "mk", 2) == 0) {
char *pathp; /* path */
char *nodep; /* new node to add */
int nodeoffset; /* node offset from libfdt */
int err;

/*
* Parameters: Node path, new node to be appended to the path.
*/
if (argc < 4) {
uart_puts(cmd_fdt_usage);
return 0;
}

pathp = argv[2];
nodep = argv[3];

nodeoffset = fdt_path_offset(image.of_dest, pathp);
if (nodeoffset < 0) {
/*
* Not found or something else bad happened.
*/
printk(LOG_LEVEL_MUTE, "libfdt fdt_path_offset() returned %s\n", fdt_strerror(nodeoffset));
return 1;
}
err = fdt_add_subnode(image.of_dest, nodeoffset, nodep);
if (err < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_add_subnode(): %s\n", fdt_strerror(err));
return 1;
}
} else if (strncmp(argv[1], "set", 3) == 0) {
char *pathp; /* path */
char *prop; /* property */
int nodeoffset; /* node offset from libfdt */
static char data[SCRATCHPAD] __aligned(4); /* property storage */
const void *ptmp;
int len; /* new length of the property */
int ret; /* return value */

/*
* Parameters: Node path, property, optional value.
*/
if (argc < 4) {
uart_puts(cmd_fdt_usage);
return 0;
}

pathp = argv[2];
prop = argv[3];

nodeoffset = fdt_path_offset(image.of_dest, pathp);
if (nodeoffset < 0) {
/*
* Not found or something else bad happened.
*/
printk(LOG_LEVEL_MUTE, "libfdt fdt_path_offset() returned %s\n", fdt_strerror(nodeoffset));
return 1;
}

if (argc == 4) {
len = 0;
} else {
ptmp = fdt_getprop(image.of_dest, nodeoffset, prop, &len);
if (len > SCRATCHPAD) {
printk(LOG_LEVEL_MUTE, "prop (%d) doesn't fit in scratchpad!\n", len);
return 1;
}
if (ptmp != NULL)
memcpy(data, ptmp, len);

ret = fdt_parse_prop(&argv[4], argc - 4, data, &len);
if (ret != 0)
return ret;
}

ret = fdt_setprop(image.of_dest, nodeoffset, prop, data, len);
if (ret < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_setprop(): %s\n", fdt_strerror(ret));
return 1;
}
} else if ((argv[1][0] == 'p') || (argv[1][0] == 'l')) {
int depth = MAX_LEVEL; /* how deep to print */
char *pathp; /* path */
char *prop; /* property */
int ret; /* return value */
static char root[2] = "/";

/*
* list is an alias for print, but limited to 1 level
*/
if (argv[1][0] == 'l') {
depth = 1;
}

/*
* Get the starting path. The root node is an oddball,
* the offset is zero and has no name.
*/
if (argc == 2)
pathp = root;
else
pathp = argv[2];
if (argc > 3)
prop = argv[3];
else
prop = NULL;

fdt_print(image.of_dest, pathp, prop, depth);
} else if (strncmp(argv[1], "rm", 2) == 0) {
int nodeoffset; /* node offset from libfdt */
int err;

/*
* Get the path. The root node is an oddball, the offset
* is zero and has no name.
*/
nodeoffset = fdt_path_offset(image.of_dest, argv[2]);
if (nodeoffset < 0) {
/*
* Not found or something else bad happened.
*/
printk(LOG_LEVEL_MUTE, "libfdt fdt_path_offset() returned %s\n", fdt_strerror(nodeoffset));
return 1;
}
/*
* Do the delete. A fourth parameter means delete a property,
* otherwise delete the node.
*/
if (argc > 3) {
err = fdt_delprop(image.of_dest, nodeoffset, argv[3]);
if (err < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_delprop(): %s\n", fdt_strerror(err));
return 0;
}
} else {
err = fdt_del_node(image.of_dest, nodeoffset);
if (err < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_del_node(): %s\n", fdt_strerror(err));
return 0;
}
}
} else if (argv[1][0] == 'h') {
u32 version = fdt_version(image.of_dest);
printk(LOG_LEVEL_MUTE, "magic:\t\t\t0x%x\n", fdt_magic(image.of_dest));
printk(LOG_LEVEL_MUTE, "totalsize:\t\t0x%x (%d)\n", fdt_totalsize(image.of_dest),
fdt_totalsize(image.of_dest));
printk(LOG_LEVEL_MUTE, "off_dt_struct:\t\t0x%x\n",
fdt_off_dt_struct(image.of_dest));
printk(LOG_LEVEL_MUTE, "off_dt_strings:\t\t0x%x\n",
fdt_off_dt_strings(image.of_dest));
printk(LOG_LEVEL_MUTE, "off_mem_rsvmap:\t\t0x%x\n",
fdt_off_mem_rsvmap(image.of_dest));
printk(LOG_LEVEL_MUTE, "version:\t\t%d\n", version);
printk(LOG_LEVEL_MUTE, "last_comp_version:\t%d\n",
fdt_last_comp_version(image.of_dest));
if (version >= 2)
printk(LOG_LEVEL_MUTE, "boot_cpuid_phys:\t0x%x\n",
fdt_boot_cpuid_phys(image.of_dest));
if (version >= 3)
printk(LOG_LEVEL_MUTE, "size_dt_strings:\t0x%x\n",
fdt_size_dt_strings(image.of_dest));
if (version >= 17)
printk(LOG_LEVEL_MUTE, "size_dt_struct:\t\t0x%x\n",
fdt_size_dt_struct(image.of_dest));
printk(LOG_LEVEL_MUTE, "number mem_rsv:\t\t0x%x\n",
fdt_num_mem_rsv(image.of_dest));
printk(LOG_LEVEL_MUTE, "\n");
} else if (strncmp(argv[1], "rs", 2) == 0) {
if (argv[2][0] == 'p') {
uint64_t addr, size;
int total = fdt_num_mem_rsv(image.of_dest);
int j, err;
printk(LOG_LEVEL_MUTE, "index\t\t start\t\t size\n");
printk(LOG_LEVEL_MUTE, "-------------------------------"
"-----------------\n");
for (j = 0; j < total; j++) {
err = fdt_get_mem_rsv(image.of_dest, j, &addr, &size);
if (err < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_get_mem_rsv(): %s\n", fdt_strerror(err));
return 0;
}
printk(LOG_LEVEL_MUTE, " %x\t%08x%08x\t%08x%08x\n", j,
(u32) (addr >> 32),
(u32) (addr & 0xffffffff),
(u32) (size >> 32),
(u32) (size & 0xffffffff));
}
} else if (argv[2][0] == 'a') {
uint64_t addr, size;
int err;
addr = simple_strtoull(argv[3], NULL, 16);
size = simple_strtoull(argv[4], NULL, 16);
err = fdt_add_mem_rsv(image.of_dest, addr, size);

if (err < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_add_mem_rsv(): %s\n", fdt_strerror(err));
return 0;
}
} else if (argv[2][0] == 'd') {
unsigned long idx = simple_strtoul(argv[3], NULL, 16);
int err = fdt_del_mem_rsv(image.of_dest, idx);

if (err < 0) {
printk(LOG_LEVEL_MUTE, "libfdt fdt_del_mem_rsv(): %s\n", fdt_strerror(err));
return 0;
}
} else {
uart_puts(cmd_fdt_usage);
return 0;
}
} else {
uart_puts(cmd_fdt_usage);
return 0;
}
return 0;
}
#endif // SYTERKIT_CLI_CMD_FDT
Loading

0 comments on commit 23316e2

Please sign in to comment.