mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-02 01:20:47 +09:00
Merge commit 'u-boot-fdt/testing'
This commit is contained in:
commit
a449c500b1
@ -263,7 +263,6 @@ static void ft_blob_update(void *blob, bd_t *bd)
|
|||||||
{
|
{
|
||||||
int len, ret, nodeoffset = 0;
|
int len, ret, nodeoffset = 0;
|
||||||
char module_name[MODULE_NAME_MAXLEN] = {0};
|
char module_name[MODULE_NAME_MAXLEN] = {0};
|
||||||
ulong memory_data[2] = {0};
|
|
||||||
|
|
||||||
compose_module_name(hw_id, module_name);
|
compose_module_name(hw_id, module_name);
|
||||||
len = strlen(module_name) + 1;
|
len = strlen(module_name) + 1;
|
||||||
@ -273,22 +272,12 @@ static void ft_blob_update(void *blob, bd_t *bd)
|
|||||||
printf("ft_blob_update(): cannot set /model property err:%s\n",
|
printf("ft_blob_update(): cannot set /model property err:%s\n",
|
||||||
fdt_strerror(ret));
|
fdt_strerror(ret));
|
||||||
|
|
||||||
memory_data[0] = cpu_to_be32(bd->bi_memstart);
|
ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
|
||||||
memory_data[1] = cpu_to_be32(bd->bi_memsize);
|
|
||||||
|
|
||||||
nodeoffset = fdt_path_offset (blob, "/memory");
|
if (ret < 0) {
|
||||||
if (nodeoffset >= 0) {
|
|
||||||
ret = fdt_setprop(blob, nodeoffset, "reg", memory_data,
|
|
||||||
sizeof(memory_data));
|
|
||||||
if (ret < 0)
|
|
||||||
printf("ft_blob_update): cannot set /memory/reg "
|
printf("ft_blob_update): cannot set /memory/reg "
|
||||||
"property err:%s\n", fdt_strerror(ret));
|
"property err:%s\n", fdt_strerror(ret));
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
/* memory node is required in dts */
|
|
||||||
printf("ft_blob_update(): cannot find /memory node "
|
|
||||||
"err:%s\n", fdt_strerror(nodeoffset));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
|
#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
|
||||||
|
|
||||||
|
@ -329,25 +329,14 @@ nand_init (void)
|
|||||||
*/
|
*/
|
||||||
void ft_blob_update(void *blob, bd_t *bd)
|
void ft_blob_update(void *blob, bd_t *bd)
|
||||||
{
|
{
|
||||||
int ret, nodeoffset = 0;
|
int ret;
|
||||||
ulong memory_data[2] = {0};
|
|
||||||
|
|
||||||
memory_data[0] = cpu_to_be32(bd->bi_memstart);
|
ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
|
||||||
memory_data[1] = cpu_to_be32(bd->bi_memsize);
|
|
||||||
|
|
||||||
nodeoffset = fdt_find_node_by_path (blob, "/memory");
|
if (ret < 0) {
|
||||||
if (nodeoffset >= 0) {
|
|
||||||
ret = fdt_setprop(blob, nodeoffset, "reg", memory_data,
|
|
||||||
sizeof(memory_data));
|
|
||||||
if (ret < 0)
|
|
||||||
printf("ft_blob_update): cannot set /memory/reg "
|
printf("ft_blob_update): cannot set /memory/reg "
|
||||||
"property err:%s\n", fdt_strerror(ret));
|
"property err:%s\n", fdt_strerror(ret));
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
/* memory node is required in dts */
|
|
||||||
printf("ft_blob_update(): cannot find /memory node "
|
|
||||||
"err:%s\n", fdt_strerror(nodeoffset));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ft_board_setup(void *blob, bd_t *bd)
|
void ft_board_setup(void *blob, bd_t *bd)
|
||||||
|
@ -55,7 +55,7 @@ COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
|
|||||||
COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
|
COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
|
||||||
COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
|
COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
|
||||||
COBJS-y += cmd_fdc.o
|
COBJS-y += cmd_fdc.o
|
||||||
COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o
|
COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
|
||||||
COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
|
COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
|
||||||
COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
|
COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
|
||||||
ifdef CONFIG_FPGA
|
ifdef CONFIG_FPGA
|
||||||
@ -105,7 +105,6 @@ COBJS-y += env_onenand.o
|
|||||||
COBJS-y += env_nvram.o
|
COBJS-y += env_nvram.o
|
||||||
COBJS-y += env_nowhere.o
|
COBJS-y += env_nowhere.o
|
||||||
COBJS-y += exports.o
|
COBJS-y += exports.o
|
||||||
COBJS-y += fdt_support.o
|
|
||||||
COBJS-y += flash.o
|
COBJS-y += flash.o
|
||||||
COBJS-y += fpga.o
|
COBJS-y += fpga.o
|
||||||
COBJS-y += ft_build.o
|
COBJS-y += ft_build.o
|
||||||
|
@ -588,7 +588,7 @@ static int fdt_print(const char *pathp, char *prop, int depth)
|
|||||||
printf("%s %s\n", pathp, prop);
|
printf("%s %s\n", pathp, prop);
|
||||||
return 0;
|
return 0;
|
||||||
} else if (len > 0) {
|
} else if (len > 0) {
|
||||||
printf("%s=", prop);
|
printf("%s = ", prop);
|
||||||
print_data (nodep, len);
|
print_data (nodep, len);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
return 0;
|
return 0;
|
||||||
@ -649,7 +649,7 @@ static int fdt_print(const char *pathp, char *prop, int depth)
|
|||||||
pathp);
|
pathp);
|
||||||
} else {
|
} else {
|
||||||
if (level <= depth) {
|
if (level <= depth) {
|
||||||
printf("%s%s=",
|
printf("%s%s = ",
|
||||||
&tabs[MAX_LEVEL - level],
|
&tabs[MAX_LEVEL - level],
|
||||||
pathp);
|
pathp);
|
||||||
print_data (nodep, len);
|
print_data (nodep, len);
|
||||||
|
@ -24,13 +24,11 @@
|
|||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <linux/ctype.h>
|
#include <linux/ctype.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
||||||
#ifdef CONFIG_OF_LIBFDT
|
|
||||||
|
|
||||||
#include <asm/global_data.h>
|
#include <asm/global_data.h>
|
||||||
#include <fdt.h>
|
#include <fdt.h>
|
||||||
#include <libfdt.h>
|
#include <libfdt.h>
|
||||||
#include <fdt_support.h>
|
#include <fdt_support.h>
|
||||||
|
#include <exports.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Global data (for the gd->bd)
|
* Global data (for the gd->bd)
|
||||||
@ -70,6 +68,43 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
|
|||||||
return fdt_setprop(fdt, nodeoff, prop, val, len);
|
return fdt_setprop(fdt, nodeoff, prop, val, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF_STDOUT_VIA_ALIAS
|
||||||
|
static int fdt_fixup_stdout(void *fdt, int choosenoff)
|
||||||
|
{
|
||||||
|
int err = 0;
|
||||||
|
#ifdef CONFIG_CONS_INDEX
|
||||||
|
int node;
|
||||||
|
char sername[9] = { 0 };
|
||||||
|
const char *path;
|
||||||
|
|
||||||
|
sprintf(sername, "serial%d", CONFIG_CONS_INDEX - 1);
|
||||||
|
|
||||||
|
err = node = fdt_path_offset(fdt, "/aliases");
|
||||||
|
if (node >= 0) {
|
||||||
|
int len;
|
||||||
|
path = fdt_getprop(fdt, node, sername, &len);
|
||||||
|
if (path) {
|
||||||
|
char *p = malloc(len);
|
||||||
|
err = -FDT_ERR_NOSPACE;
|
||||||
|
if (p) {
|
||||||
|
memcpy(p, path, len);
|
||||||
|
err = fdt_setprop(fdt, choosenoff,
|
||||||
|
"linux,stdout-path", p, len);
|
||||||
|
free(p);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err = len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (err < 0)
|
||||||
|
printf("WARNING: could not set linux,stdout-path %s.\n",
|
||||||
|
fdt_strerror(err));
|
||||||
|
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
|
int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
|
||||||
{
|
{
|
||||||
int nodeoffset;
|
int nodeoffset;
|
||||||
@ -160,6 +195,11 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
|
|||||||
printf("WARNING: could not set linux,initrd-end %s.\n",
|
printf("WARNING: could not set linux,initrd-end %s.\n",
|
||||||
fdt_strerror(err));
|
fdt_strerror(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF_STDOUT_VIA_ALIAS
|
||||||
|
err = fdt_fixup_stdout(fdt, nodeoffset);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef OF_STDOUT_PATH
|
#ifdef OF_STDOUT_PATH
|
||||||
err = fdt_setprop(fdt, nodeoffset,
|
err = fdt_setprop(fdt, nodeoffset,
|
||||||
"linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1);
|
"linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1);
|
||||||
@ -441,6 +481,87 @@ void do_fixup_by_compat_u32(void *fdt, const char *compat,
|
|||||||
do_fixup_by_compat(fdt, compat, prop, &val, 4, create);
|
do_fixup_by_compat(fdt, compat, prop, &val, 4, create);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int fdt_fixup_memory(void *blob, u64 start, u64 size)
|
||||||
|
{
|
||||||
|
int err, nodeoffset, len = 0;
|
||||||
|
u8 tmp[16];
|
||||||
|
const u32 *addrcell, *sizecell;
|
||||||
|
|
||||||
|
err = fdt_check_header(blob);
|
||||||
|
if (err < 0) {
|
||||||
|
printf("%s: %s\n", __FUNCTION__, fdt_strerror(err));
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* update, or add and update /memory node */
|
||||||
|
nodeoffset = fdt_path_offset(blob, "/memory");
|
||||||
|
if (nodeoffset < 0) {
|
||||||
|
nodeoffset = fdt_add_subnode(blob, 0, "memory");
|
||||||
|
if (nodeoffset < 0)
|
||||||
|
printf("WARNING: could not create /memory: %s.\n",
|
||||||
|
fdt_strerror(nodeoffset));
|
||||||
|
return nodeoffset;
|
||||||
|
}
|
||||||
|
err = fdt_setprop(blob, nodeoffset, "device_type", "memory",
|
||||||
|
sizeof("memory"));
|
||||||
|
if (err < 0) {
|
||||||
|
printf("WARNING: could not set %s %s.\n", "device_type",
|
||||||
|
fdt_strerror(err));
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
addrcell = fdt_getprop(blob, 0, "#address-cells", NULL);
|
||||||
|
/* use shifts and mask to ensure endianness */
|
||||||
|
if ((addrcell) && (*addrcell == 2)) {
|
||||||
|
tmp[0] = (start >> 56) & 0xff;
|
||||||
|
tmp[1] = (start >> 48) & 0xff;
|
||||||
|
tmp[2] = (start >> 40) & 0xff;
|
||||||
|
tmp[3] = (start >> 32) & 0xff;
|
||||||
|
tmp[4] = (start >> 24) & 0xff;
|
||||||
|
tmp[5] = (start >> 16) & 0xff;
|
||||||
|
tmp[6] = (start >> 8) & 0xff;
|
||||||
|
tmp[7] = (start ) & 0xff;
|
||||||
|
len = 8;
|
||||||
|
} else {
|
||||||
|
tmp[0] = (start >> 24) & 0xff;
|
||||||
|
tmp[1] = (start >> 16) & 0xff;
|
||||||
|
tmp[2] = (start >> 8) & 0xff;
|
||||||
|
tmp[3] = (start ) & 0xff;
|
||||||
|
len = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
sizecell = fdt_getprop(blob, 0, "#size-cells", NULL);
|
||||||
|
/* use shifts and mask to ensure endianness */
|
||||||
|
if ((sizecell) && (*sizecell == 2)) {
|
||||||
|
tmp[0+len] = (size >> 56) & 0xff;
|
||||||
|
tmp[1+len] = (size >> 48) & 0xff;
|
||||||
|
tmp[2+len] = (size >> 40) & 0xff;
|
||||||
|
tmp[3+len] = (size >> 32) & 0xff;
|
||||||
|
tmp[4+len] = (size >> 24) & 0xff;
|
||||||
|
tmp[5+len] = (size >> 16) & 0xff;
|
||||||
|
tmp[6+len] = (size >> 8) & 0xff;
|
||||||
|
tmp[7+len] = (size ) & 0xff;
|
||||||
|
len += 8;
|
||||||
|
} else {
|
||||||
|
tmp[0+len] = (size >> 24) & 0xff;
|
||||||
|
tmp[1+len] = (size >> 16) & 0xff;
|
||||||
|
tmp[2+len] = (size >> 8) & 0xff;
|
||||||
|
tmp[3+len] = (size ) & 0xff;
|
||||||
|
len += 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = fdt_setprop(blob, nodeoffset, "reg", tmp, len);
|
||||||
|
if (err < 0) {
|
||||||
|
printf("WARNING: could not set %s %s.\n",
|
||||||
|
"reg", fdt_strerror(err));
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\
|
||||||
|
defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
|
||||||
|
|
||||||
void fdt_fixup_ethernet(void *fdt, bd_t *bd)
|
void fdt_fixup_ethernet(void *fdt, bd_t *bd)
|
||||||
{
|
{
|
||||||
int node;
|
int node;
|
||||||
@ -486,5 +607,4 @@ void fdt_fixup_ethernet(void *fdt, bd_t *bd)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif /* CONFIG_OF_LIBFDT */
|
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include <ft_build.h>
|
#include <ft_build.h>
|
||||||
#elif defined(CONFIG_OF_LIBFDT)
|
#elif defined(CONFIG_OF_LIBFDT)
|
||||||
#include <libfdt.h>
|
#include <libfdt.h>
|
||||||
|
#include <fdt_support.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
@ -526,7 +527,6 @@ ft_cpu_setup(void *blob, bd_t *bd)
|
|||||||
int nodeoffset;
|
int nodeoffset;
|
||||||
int err;
|
int err;
|
||||||
int j;
|
int j;
|
||||||
int tmp[2];
|
|
||||||
|
|
||||||
for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) {
|
for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) {
|
||||||
nodeoffset = fdt_path_offset(blob, fixup_props[j].node);
|
nodeoffset = fdt_path_offset(blob, fixup_props[j].node);
|
||||||
@ -543,21 +543,7 @@ ft_cpu_setup(void *blob, bd_t *bd)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update, or add and update /memory node */
|
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
|
||||||
nodeoffset = fdt_path_offset(blob, "/memory");
|
|
||||||
if (nodeoffset < 0) {
|
|
||||||
nodeoffset = fdt_add_subnode(blob, 0, "memory");
|
|
||||||
if (nodeoffset < 0)
|
|
||||||
debug("failed to add /memory node: %s\n",
|
|
||||||
fdt_strerror(nodeoffset));
|
|
||||||
}
|
|
||||||
if (nodeoffset >= 0) {
|
|
||||||
fdt_setprop(blob, nodeoffset, "device_type",
|
|
||||||
"memory", sizeof("memory"));
|
|
||||||
tmp[0] = cpu_to_be32(bd->bi_memstart);
|
|
||||||
tmp[1] = cpu_to_be32(bd->bi_memsize);
|
|
||||||
fdt_setprop(blob, nodeoffset, "reg", tmp, sizeof(tmp));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#elif defined(CONFIG_OF_FLAT_TREE)
|
#elif defined(CONFIG_OF_FLAT_TREE)
|
||||||
void
|
void
|
||||||
|
@ -44,6 +44,7 @@ void do_fixup_by_compat(void *fdt, const char *compat,
|
|||||||
const char *prop, const void *val, int len, int create);
|
const char *prop, const void *val, int len, int create);
|
||||||
void do_fixup_by_compat_u32(void *fdt, const char *compat,
|
void do_fixup_by_compat_u32(void *fdt, const char *compat,
|
||||||
const char *prop, u32 val, int create);
|
const char *prop, u32 val, int create);
|
||||||
|
int fdt_fixup_memory(void *blob, u64 start, u64 size);
|
||||||
void fdt_fixup_ethernet(void *fdt, bd_t *bd);
|
void fdt_fixup_ethernet(void *fdt, bd_t *bd);
|
||||||
|
|
||||||
#ifdef CONFIG_OF_HAS_UBOOT_ENV
|
#ifdef CONFIG_OF_HAS_UBOOT_ENV
|
||||||
|
Loading…
Reference in New Issue
Block a user