Re: [PATCH v4] Terasic DE0-Nano-SoC: add support
Hi Tim, On Thu, Feb 11, 2016 at 03:40:41PM +0100, Tim Sander wrote: > Hi > > Am Montag, 1. Februar 2016, 11:08:10 schrieb Andrey Smirnov: > ... > > > diff --git a/arch/arm/boards/terasic-de0-nano-soc/board.c > > > b/arch/arm/boards/terasic-de0-nano-soc/board.c new file mode 100644 > > > index 000..22f8291 > > > --- /dev/null > > > +++ b/arch/arm/boards/terasic-de0-nano-soc/board.c > > > @@ -0,0 +1,37 @@ > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > + > > > +static int phy_fixup(struct phy_device *dev) > > > +{ > > > + /* min rx data delay */ > > > + phy_write(dev, 0x0b, 0x8105); > > > + phy_write(dev, 0x0c, 0x); > > > + > > > + /* max rx/tx clock delay, min rx/tx control delay */ > > > + phy_write(dev, 0x0b, 0x8104); > > > + phy_write(dev, 0x0c, 0xa0d0); > > > + phy_write(dev, 0x0b, 0x104); > > > + > > > + return 0; > > > +} > > > + > > > +static int socfpga_console_init(void) > > > > I know that this names comes from the source code for SoCKit, but I'd > > argue that the name of this function should be changed to something > > more descriptive. This function doesn't really initialize console in > > any way and just happen to be executed on "console_initcall" level of > > execution. > > > > > +{ > > > + if (!of_machine_is_compatible("altr,socfpga-cyclone5")) > The string above will be replaced with "terasic,de0-nano-soc" but see below... > > > + return 0; > > > > Since Altera is not really a vendor of this board and, I'd suggest the > > compatibility string be renamed to "terrasic,de0-nano-soc" > Besides that the company is named Terasic i concur with you but there > is one problem: I have now just patched the kernel with the folowing patch to > add the device tree compatiblility information needed: > > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > index 555e9caf21e1..3a427423168e 100644 > --- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > +++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > @@ -18,7 +18,7 @@ > > / { > model = "Terasic DE-0(Atlas)"; > - compatible = "altr,socfpga-cyclone5", "altr,socfpga"; > + compatible = "terasic,de0-nano-soc"," altr,socfpga-cyclone5", > "altr,socfpga"; > > chosen { > bootargs = "earlyprintk"; > -- > 1.9.1 > > But now i have the barebox bootmessage which states the following on boot: > -- > blspec: blspec_scan_directory: mmc loader/entries > blspec: blspec_scan_directory: /mnt/mmc0.2 loader/entries > blspec: ignoring entry with incompatible devicetree "terasic,de0-nano-soc" > -- Ok, barebox finds a device tree compatible to "terasic,de0-nano-soc" on the SD card, but thinks it itself is not compatible to that. It seems the patch above has no effect. Could you check with of_dump that /compatible is indeed what you expect it to be? Note that you have a typo in your compatible string. " altr,socfpga-cyclone5" should be "altr,socfpga-cyclone5". That should cause your problem though. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] commands: of_dump: Add description for -n option
Signed-off-by: Sascha Hauer --- commands/of_dump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commands/of_dump.c b/commands/of_dump.c index b15f54a..7bec0b9 100644 --- a/commands/of_dump.c +++ b/commands/of_dump.c @@ -141,12 +141,13 @@ BAREBOX_CMD_HELP_START(of_dump) BAREBOX_CMD_HELP_TEXT("Options:") BAREBOX_CMD_HELP_OPT ("-f dtb", "work on dtb instead of internal devicetree\n") BAREBOX_CMD_HELP_OPT ("-F", "return fixed devicetree\n") +BAREBOX_CMD_HELP_OPT ("-n", "Print node names only, no properties\n") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(of_dump) .cmd= do_of_dump, BAREBOX_CMD_DESC("dump devicetree nodes") - BAREBOX_CMD_OPTS("[-fF] [NODE]") + BAREBOX_CMD_OPTS("[-fFn] [NODE]") BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_COMPLETE(devicetree_file_complete) BAREBOX_CMD_HELP(cmd_of_dump_help) -- 2.7.0.rc3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH] scripts: make __init__.py nonempty
On Fr, 2016-02-12 at 08:45 +0100, Sascha Hauer wrote: > Otherwise they get removed by make distclean. > > Signed-off-by: Sascha Hauer Looks good. Jan -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH v5] Terasic DE0-Nano-SoC: add support
v5: remove led functions, rename socfpga_console_init -> socfpga_init use more specific device tree identifier, needs a kernel dts addition though: add "terasic,de0-nano-soc" to compatible string in dts file of the board. A Patch for supporting the Terasic DE0 NANO-SoC with barebox. The pretty similar Socrates Board was taken as a starting point with pulling in the memory timings/pinmux from http://rocketboards.org/foswiki/view/Documentation/AtlasSoCCompileHardwareDesign --- Signed-off-by: Tim Sander arch/arm/boards/Makefile | 1 + arch/arm/boards/terasic-de0-nano-soc/Makefile | 2 + arch/arm/boards/terasic-de0-nano-soc/board.c | 35 ++ arch/arm/boards/terasic-de0-nano-soc/config.h | 1 + .../terasic-de0-nano-soc/iocsr_config_cyclone5.c | 675 + arch/arm/boards/terasic-de0-nano-soc/lowlevel.c| 76 +++ .../boards/terasic-de0-nano-soc/pinmux_config.c| 240 arch/arm/boards/terasic-de0-nano-soc/pll_config.h | 107 .../arm/boards/terasic-de0-nano-soc/sdram_config.h | 108 .../boards/terasic-de0-nano-soc/sequencer_auto.h | 228 +++ .../terasic-de0-nano-soc/sequencer_auto_ac_init.c | 69 +++ .../sequencer_auto_inst_init.c | 161 + .../terasic-de0-nano-soc/sequencer_defines.h | 160 + arch/arm/configs/socfpga-xload_defconfig | 1 + arch/arm/configs/socfpga_defconfig | 1 + arch/arm/dts/Makefile | 1 + arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 34 ++ arch/arm/mach-socfpga/Kconfig | 4 + images/Makefile.socfpga| 8 + 19 files changed, 1912 insertions(+) create mode 100644 arch/arm/boards/terasic-de0-nano-soc/Makefile create mode 100644 arch/arm/boards/terasic-de0-nano-soc/board.c create mode 100644 arch/arm/boards/terasic-de0-nano-soc/config.h create mode 100644 arch/arm/boards/terasic-de0-nano-soc/iocsr_config_cyclone5.c create mode 100644 arch/arm/boards/terasic-de0-nano-soc/lowlevel.c create mode 100644 arch/arm/boards/terasic-de0-nano-soc/pinmux_config.c create mode 100644 arch/arm/boards/terasic-de0-nano-soc/pll_config.h create mode 100644 arch/arm/boards/terasic-de0-nano-soc/sdram_config.h create mode 100644 arch/arm/boards/terasic-de0-nano-soc/sequencer_auto.h create mode 100644 arch/arm/boards/terasic-de0-nano-soc/sequencer_auto_ac_init.c create mode 100644 arch/arm/boards/terasic-de0-nano-soc/sequencer_auto_inst_init.c create mode 100644 arch/arm/boards/terasic-de0-nano-soc/sequencer_defines.h create mode 100644 arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 1029e8f..4d572a6 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -106,6 +106,7 @@ obj-$(CONFIG_MACH_SAMA5D4EK)+= sama5d4ek/ obj-$(CONFIG_MACH_SCB9328) += scb9328/ obj-$(CONFIG_MACH_SOCFPGA_ALTERA_SOCDK)+= altera-socdk/ obj-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES)+= ebv-socrates/ +obj-$(CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC)+= terasic-de0-nano-soc/ obj-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += terasic-sockit/ obj-$(CONFIG_MACH_SOLIDRUN_CUBOX) += solidrun-cubox/ obj-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += solidrun-microsom/ diff --git a/arch/arm/boards/terasic-de0-nano-soc/Makefile b/arch/arm/boards/terasic-de0-nano-soc/Makefile new file mode 100644 index 000..8c927fe --- /dev/null +++ b/arch/arm/boards/terasic-de0-nano-soc/Makefile @@ -0,0 +1,2 @@ +obj-y += lowlevel.o board.o +pbl-y += lowlevel.o diff --git a/arch/arm/boards/terasic-de0-nano-soc/board.c b/arch/arm/boards/terasic-de0-nano-soc/board.c new file mode 100644 index 000..919bfc8 --- /dev/null +++ b/arch/arm/boards/terasic-de0-nano-soc/board.c @@ -0,0 +1,35 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int phy_fixup(struct phy_device *dev) +{ + /* +* min rx data delay, max rx/tx clock delay, +* min rx/tx control delay +*/ + phy_write_mmd_indirect(dev, 4, 2, 0); + phy_write_mmd_indirect(dev, 5, 2, 0); + phy_write_mmd_indirect(dev, 8, 2, 0x003ff); + return 0; +} + +static int socfpga_init(void) +{ + if (!of_machine_is_compatible("terasic,de0-nano-soc")) + return 0; + + if (IS_ENABLED(CONFIG_PHYLIB)) + phy_register_fixup_for_uid(PHY_ID_KSZ9031, MICREL_PHY_ID_MASK, phy_fixup); + + return 0; +} +console_initcall(socfpga_init); diff --git a/arch/arm/boards/terasic-de0-nano-soc/config.h b/arch/arm/boards/terasic-de0-nano-soc/config.h new file mode 100644 index 000..da84fa5 --- /dev/null +++ b/arch/arm/boards/terasic-de0-nano-soc/config.h @@ -0,0 +1 @@ +/* nothing */ diff --git a/arch/arm/boards/
[PATCH v4 1/3] include: linux: add circular buffers
Signed-off-by: Steffen Trumtrar --- include/linux/circ_buf.h | 36 1 file changed, 36 insertions(+) create mode 100644 include/linux/circ_buf.h diff --git a/include/linux/circ_buf.h b/include/linux/circ_buf.h new file mode 100644 index ..90f2471dc6f2 --- /dev/null +++ b/include/linux/circ_buf.h @@ -0,0 +1,36 @@ +/* + * See Documentation/circular-buffers.txt for more information. + */ + +#ifndef _LINUX_CIRC_BUF_H +#define _LINUX_CIRC_BUF_H 1 + +struct circ_buf { + char *buf; + int head; + int tail; +}; + +/* Return count in buffer. */ +#define CIRC_CNT(head,tail,size) (((head) - (tail)) & ((size)-1)) + +/* Return space available, 0..size-1. We always leave one free char + as a completely full buffer has head == tail, which is the same as + empty. */ +#define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) + +/* Return count up to the end of the buffer. Carefully avoid + accessing head and tail more than once, so they can change + underneath us without returning inconsistent results. */ +#define CIRC_CNT_TO_END(head,tail,size) \ + ({int end = (size) - (tail); \ + int n = ((head) + end) & ((size)-1); \ + n < end ? n : end;}) + +/* Return space available up to the end of the buffer. */ +#define CIRC_SPACE_TO_END(head,tail,size) \ + ({int end = (size) - 1 - (head); \ + int n = (end + (tail)) & ((size)-1); \ + n <= end ? n : end+1;}) + +#endif /* _LINUX_CIRC_BUF_H */ -- 2.7.0.rc3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH v4 0/3] i.MX6: CAAM engine support
Hi! This series adds basic support for the i.MX6 Cryptographic Acceleration and Assurance Module (CAAM). The CAAM supports multiple hashing/encryption engines, this series only supports the included hardware random number generator. Changes since v3: - remove jobring config option - the CAAM driver doesn't do anything useful without them anyway, so always build the jr.c and probe the subdevices in ctrl.c instead of just registering the devices. - probe the RNG in ctrl.c - the RNG is a subdevice of the CAAM. Call the probe function manually if driver is enabled. - merge old patch 4/5 into new 3/3 - get rid of superfluous old patch 5/5 Tested with a riotboard. Regards, Steffen Steffen Trumtrar (3): include: linux: add circular buffers ARM: imx6: add caam clks crypto: add i.MX6 CAAM support arch/arm/mach-imx/clk-imx6.c |4 + drivers/Kconfig |1 + drivers/Makefile |1 + drivers/crypto/Kconfig| 10 + drivers/crypto/Makefile |1 + drivers/crypto/caam/Kconfig | 34 + drivers/crypto/caam/Makefile |5 + drivers/crypto/caam/caamrng.c | 291 +++ drivers/crypto/caam/ctrl.c| 601 + drivers/crypto/caam/ctrl.h| 13 + drivers/crypto/caam/desc.h| 1665 + drivers/crypto/caam/desc_constr.h | 390 + drivers/crypto/caam/error.c | 257 ++ drivers/crypto/caam/error.h | 11 + drivers/crypto/caam/intern.h | 97 +++ drivers/crypto/caam/jr.c | 348 drivers/crypto/caam/jr.h | 18 + drivers/crypto/caam/regs.h| 895 include/linux/circ_buf.h | 36 + 19 files changed, 4678 insertions(+) create mode 100644 drivers/crypto/Kconfig create mode 100644 drivers/crypto/Makefile create mode 100644 drivers/crypto/caam/Kconfig create mode 100644 drivers/crypto/caam/Makefile create mode 100644 drivers/crypto/caam/caamrng.c create mode 100644 drivers/crypto/caam/ctrl.c create mode 100644 drivers/crypto/caam/ctrl.h create mode 100644 drivers/crypto/caam/desc.h create mode 100644 drivers/crypto/caam/desc_constr.h create mode 100644 drivers/crypto/caam/error.c create mode 100644 drivers/crypto/caam/error.h create mode 100644 drivers/crypto/caam/intern.h create mode 100644 drivers/crypto/caam/jr.c create mode 100644 drivers/crypto/caam/jr.h create mode 100644 drivers/crypto/caam/regs.h create mode 100644 include/linux/circ_buf.h -- 2.7.0.rc3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH v4 2/3] ARM: imx6: add caam clks
Signed-off-by: Steffen Trumtrar --- arch/arm/mach-imx/clk-imx6.c | 4 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-imx/clk-imx6.c b/arch/arm/mach-imx/clk-imx6.c index 597e50205038..8568258644d5 100644 --- a/arch/arm/mach-imx/clk-imx6.c +++ b/arch/arm/mach-imx/clk-imx6.c @@ -443,6 +443,9 @@ static int imx6_ccm_probe(struct device_d *dev) /*name parent_name reg shift */ clks[IMX6QDL_CLK_APBH_DMA] = imx_clk_gate2("apbh_dma", "usdhc3",base + 0x68, 4); + clks[IMX6QDL_CLK_CAAM_MEM] = imx_clk_gate2("caam_mem", "ahb", base + 0x68, 8); + clks[IMX6QDL_CLK_CAAM_ACLK]= imx_clk_gate2("caam_aclk", "ahb", base + 0x68, 10); + clks[IMX6QDL_CLK_CAAM_IPG] = imx_clk_gate2("caam_ipg", "ipg", base + 0x68, 12); clks[IMX6QDL_CLK_ECSPI1] = imx_clk_gate2("ecspi1", "ecspi_root",base + 0x6c, 0); clks[IMX6QDL_CLK_ECSPI2] = imx_clk_gate2("ecspi2", "ecspi_root",base + 0x6c, 2); clks[IMX6QDL_CLK_ECSPI3] = imx_clk_gate2("ecspi3", "ecspi_root",base + 0x6c, 4); @@ -477,6 +480,7 @@ static int imx6_ccm_probe(struct device_d *dev) clks[IMX6QDL_CLK_USDHC2] = imx_clk_gate2("usdhc2", "usdhc2_podf", base + 0x80, 4); clks[IMX6QDL_CLK_USDHC3] = imx_clk_gate2("usdhc3", "usdhc3_podf", base + 0x80, 6); clks[IMX6QDL_CLK_USDHC4] = imx_clk_gate2("usdhc4", "usdhc4_podf", base + 0x80, 8); + clks[IMX6QDL_CLK_EIM_SLOW] = imx_clk_gate2("eim_slow", "eim_slow_podf", base + 0x80, 10); clks[IMX6QDL_CLK_CKO1] = imx_clk_gate("cko1", "cko1_podf", base + 0x60, 7); clks[IMX6QDL_CLK_CKO2] = imx_clk_gate("cko2", "cko2_podf", base + 0x60, 24); -- 2.7.0.rc3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH v4] Terasic DE0-Nano-SoC: add support
Hi Sascha Thanks for your hints. Am Freitag, 12. Februar 2016, 09:33:20 schrieb Sascha Hauer: > Hi Tim, > > On Thu, Feb 11, 2016 at 03:40:41PM +0100, Tim Sander wrote: > > Hi > > > > Am Montag, 1. Februar 2016, 11:08:10 schrieb Andrey Smirnov: > > ... > > > > > > diff --git a/arch/arm/boards/terasic-de0-nano-soc/board.c > > > > b/arch/arm/boards/terasic-de0-nano-soc/board.c new file mode 100644 > > > > index 000..22f8291 > > > > --- /dev/null > > > > +++ b/arch/arm/boards/terasic-de0-nano-soc/board.c > > > > @@ -0,0 +1,37 @@ > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > + > > > > +static int phy_fixup(struct phy_device *dev) > > > > +{ > > > > + /* min rx data delay */ > > > > + phy_write(dev, 0x0b, 0x8105); > > > > + phy_write(dev, 0x0c, 0x); > > > > + > > > > + /* max rx/tx clock delay, min rx/tx control delay */ > > > > + phy_write(dev, 0x0b, 0x8104); > > > > + phy_write(dev, 0x0c, 0xa0d0); > > > > + phy_write(dev, 0x0b, 0x104); > > > > + > > > > + return 0; > > > > +} > > > > + > > > > +static int socfpga_console_init(void) > > > > > > I know that this names comes from the source code for SoCKit, but I'd > > > argue that the name of this function should be changed to something > > > more descriptive. This function doesn't really initialize console in > > > any way and just happen to be executed on "console_initcall" level of > > > execution. > > > > > > > +{ > > > > + if (!of_machine_is_compatible("altr,socfpga-cyclone5")) > > > > The string above will be replaced with "terasic,de0-nano-soc" but see > > below...> > > > > + return 0; > > > > > > Since Altera is not really a vendor of this board and, I'd suggest the > > > compatibility string be renamed to "terrasic,de0-nano-soc" > > > > Besides that the company is named Terasic i concur with you but there > > is one problem: I have now just patched the kernel with the folowing patch > > to add the device tree compatiblility information needed: > > > > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > > b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts index > > 555e9caf21e1..3a427423168e 100644 > > --- a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > > +++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts > > @@ -18,7 +18,7 @@ > > > > / { > > > > model = "Terasic DE-0(Atlas)"; > > > > - compatible = "altr,socfpga-cyclone5", "altr,socfpga"; > > + compatible = "terasic,de0-nano-soc"," altr,socfpga-cyclone5", > > "altr,socfpga";> > > chosen { > > > > bootargs = "earlyprintk"; > > Ok, barebox finds a device tree compatible to "terasic,de0-nano-soc" on > the SD card, but thinks it itself is not compatible to that. It seems > the patch above has no effect. Could you check with of_dump that > /compatible is indeed what you expect it to be? > Note that you have a typo in your compatible string. " > altr,socfpga-cyclone5" should be "altr,socfpga-cyclone5". That should cause > your problem > though. Well i found out that i forgot to add the "terasic,de0-nano-soc" string to the dts file within barebox. So just adding it in board.c and in linux kernel dts didn't suffice. Best regards Tim ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] regmap: Add missing prototype for regmap_exit()
Signed-off-by: Sascha Hauer --- include/regmap.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/regmap.h b/include/regmap.h index 4cb473c..bcbe6c1 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -41,6 +41,7 @@ struct regmap *regmap_init(struct device_d *dev, const struct regmap_bus *bus, void *bus_context, const struct regmap_config *config); +void regmap_exit(struct regmap *map); struct regmap *dev_get_regmap(struct device_d *dev, const char *name); struct regmap *of_node_to_regmap(struct device_node *node); -- 2.7.0.rc3 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 1/2] bootm: restore load DT message for plain oftree files
This message was dropped when reorganizing the DT loading code, and it's really confusing to miss this. Signed-off-by: Lucas Stach --- common/bootm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/bootm.c b/common/bootm.c index 79833e045dc8..671f93f615cb 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -336,6 +336,7 @@ int bootm_load_devicetree(struct image_data *data, unsigned long load_address) ret = bootm_open_oftree_uimage(data, &size, &oftree); break; case filetype_oftree: + printf("Loading devicetree from '%s'\n", data->oftree_file); ret = read_file_2(data->oftree_file, &size, (void *)&oftree, FILESIZE_MAX); break; -- 2.1.4 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 2/2] bootm: parse initrd and oftree into correct struct members
The code parsing the oftree and initrd file names is clearly wrong, leading to bootm not loading oftree or initrd files any more. Signed-off-by: Lucas Stach --- common/bootm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 671f93f615cb..acf814dfe32c 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -505,8 +505,8 @@ int bootm_boot(struct bootm_data *bootm_data) data = xzalloc(sizeof(*data)); bootm_image_name_and_part(bootm_data->os_file, &data->os_file, &data->os_part); - bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_part, &data->os_part); - bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_part, &data->os_part); + bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_file, &data->oftree_part); + bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_file, &data->initrd_part); data->verbose = bootm_data->verbose; data->verify = bootm_data->verify; data->force = bootm_data->force; -- 2.1.4 ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox