Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-04-04 06:46:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: board: cm_fx6: fixup mtd partitions in the fdt

Browse source 
The cm-fx6 module has an on-board st,m25p compatible spi flash chip
used for U-Boot (binary & environment). Overwrite the partitions in
the device tree by the partition table provided in the mtdparts
environment variable, if it is set.

This allows to specify a kernel independent partitioning in the
environment and provides a convient way for the user to adapt the
partition table.

Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Christopher Spinrath 2016-07-12 23:37:36 +02:00 • committed by Stefano Babic
parent f4ae23a7cd
commit 62d6bac660
1 changed files with 17 additions and 1 deletions

18
board/compulab/cm_fx6/cm_fx6.c
View file

@ -12,6 +12,7 @@
#include <dm.h> #include <dm.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
#include <miiphy.h> #include <miiphy.h>
#include <mtd_node.h>
#include <netdev.h> #include <netdev.h>
#include <errno.h> #include <errno.h>
#include <usb.h> #include <usb.h>
@ -28,6 +29,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <jffs2/load_kernel.h>
#include "common.h" #include "common.h"
#include "../common/eeprom.h" #include "../common/eeprom.h"
#include "../common/common.h" #include "../common/common.h"
@ -581,6 +583,17 @@ int cm_fx6_setup_ecspi(void) { return 0; }
#ifdef CONFIG_OF_BOARD_SETUP #ifdef CONFIG_OF_BOARD_SETUP
#define USDHC3_PATH "/soc/aips-bus@02100000/usdhc@02198000/" #define USDHC3_PATH "/soc/aips-bus@02100000/usdhc@02198000/"
struct node_info nodes[] = {
/*
* Both entries target the same flash chip. The st,m25p compatible
* is used in the vendor device trees, while upstream uses (the
* documented) jedec,spi-nor comptatible.
*/
{ "st,m25p", MTD_DEV_TYPE_NOR, },
{ "jedec,spi-nor", MTD_DEV_TYPE_NOR, },
};
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
u32 baseboard_rev; u32 baseboard_rev;
@ -589,6 +602,8 @@ int ft_board_setup(void *blob, bd_t *bd)
char baseboard_name[16]; char baseboard_name[16];
int err; int err;
fdt_shrink_to_minimum(blob); /* Make room for new properties */
/* MAC addr */ /* MAC addr */
if (eth_getenv_enetaddr("ethaddr", enetaddr)) { if (eth_getenv_enetaddr("ethaddr", enetaddr)) {
fdt_find_and_setprop(blob, fdt_find_and_setprop(blob,
@ -607,7 +622,6 @@ int ft_board_setup(void *blob, bd_t *bd)
return 0; /* Assume not an early revision SB-FX6m baseboard */ return 0; /* Assume not an early revision SB-FX6m baseboard */
if (!strncmp("SB-FX6m", baseboard_name, 7) && baseboard_rev <= 120) { if (!strncmp("SB-FX6m", baseboard_name, 7) && baseboard_rev <= 120) {
fdt_shrink_to_minimum(blob); /* Make room for new properties */
nodeoffset = fdt_path_offset(blob, USDHC3_PATH); nodeoffset = fdt_path_offset(blob, USDHC3_PATH);
fdt_delprop(blob, nodeoffset, "cd-gpios"); fdt_delprop(blob, nodeoffset, "cd-gpios");
fdt_find_and_setprop(blob, USDHC3_PATH, "broken-cd", fdt_find_and_setprop(blob, USDHC3_PATH, "broken-cd",
@ -616,6 +630,8 @@ int ft_board_setup(void *blob, bd_t *bd)
NULL, 0, 1); NULL, 0, 1);
} }
fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
return 0; return 0;
} }
#endif #endif