Re: [U-Boot] [PATCH v2] Add Beaglebone Enhanced support
> Op 19 jul. 2018, om 15:02 heeft Tom Rini het volgende > geschreven: > > On Thu, Jul 19, 2018 at 02:55:37PM +0200, Marek Vasut wrote: >> On 07/18/2018 10:13 AM, Koen Kooi wrote: >>> The "Beaglebone Enhanced" by Sancloud is based on the Beaglebone Black, >>> but with the following differences: >>> >>> * Gigabit capable PHY >>> * Extra USB hub, optional i2c control >>> * lps3331ap barometer connected over i2c >>> * MPU6050 6 axis MEMS accelerometer/gyro connected over i2c >>> * 1GiB DDR3 RAM >>> * RTL8723 Wifi/Bluetooth connected over USB >>> >>> Signed-off-by: Koen Kooi >>> >>> --- >>> >> [...] >> >>> diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h >>> index 652b10b..48df914 100644 >>> --- a/board/ti/am335x/board.h >>> +++ b/board/ti/am335x/board.h >>> @@ -43,9 +43,15 @@ static inline int board_is_bbg1(void) >>> return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4); >>> } >>> >>> +static inline int board_is_bben(void) >> >> Should be just static int ... the compiler can decide. > > No, it should be inline like all of the others in the file are. And > then yes, if someone wants to do a size comparison with or without > inlining on all of those functions, sure. I wasn’t clear in my reply, I have a seperate patch that converts all of them :) regards, Koen > > -- > Tom ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] Add Beaglebone Enhanced support
> Op 19 jul. 2018, om 14:55 heeft Marek Vasut het volgende
> geschreven:
>
> On 07/18/2018 10:13 AM, Koen Kooi wrote:
>> The "Beaglebone Enhanced" by Sancloud is based on the Beaglebone Black,
>> but with the following differences:
>>
>> * Gigabit capable PHY
>> * Extra USB hub, optional i2c control
>> * lps3331ap barometer connected over i2c
>> * MPU6050 6 axis MEMS accelerometer/gyro connected over i2c
>> * 1GiB DDR3 RAM
>> * RTL8723 Wifi/Bluetooth connected over USB
>>
>> Signed-off-by: Koen Kooi
>>
>> ---
>>
> [...]
>
>> diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h
>> index 652b10b..48df914 100644
>> --- a/board/ti/am335x/board.h
>> +++ b/board/ti/am335x/board.h
>> @@ -43,9 +43,15 @@ static inline int board_is_bbg1(void)
>> return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4);
>> }
>>
>> +static inline int board_is_bben(void)
>
> Should be just static int ... the compiler can decide.
I have a seperate patch for that, but I haven’t taken the time to compile both
versions and look at size differences.
regards,
Koen
>
>> +{
>> +return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "SE", 2);
>> +}
> [...]
>
> --
> Best regards,
> Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2] Add Beaglebone Enhanced support
The "Beaglebone Enhanced" by Sancloud is based on the Beaglebone Black,
but with the following differences:
* Gigabit capable PHY
* Extra USB hub, optional i2c control
* lps3331ap barometer connected over i2c
* MPU6050 6 axis MEMS accelerometer/gyro connected over i2c
* 1GiB DDR3 RAM
* RTL8723 Wifi/Bluetooth connected over USB
Signed-off-by: Koen Kooi
---
Changes in v2:
- Moved 'Beaglebone LT pinmux' comment down a bit
board/ti/am335x/board.c | 6 --
board/ti/am335x/board.h | 8 +++-
board/ti/am335x/mux.c| 7 +++
include/configs/am335x_evm.h | 2 ++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 147ff0b..a359d20 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -725,6 +725,8 @@ int board_late_init(void)
if (board_is_bbg1())
name = "BBG1";
+ if (board_is_bben())
+ name = "BBEN";
set_board_info_env(name);
/*
@@ -870,7 +872,7 @@ int board_eth_init(bd_t *bis)
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
#ifdef CONFIG_DRIVER_TI_CPSW
- if (board_is_bone() || board_is_bone_lt() ||
+ if (board_is_bone() || board_is_bone_lt() || board_is_bben() ||
board_is_idk()) {
writel(MII_MODE_ENABLE, &cdev->miisel);
cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if =
@@ -906,7 +908,7 @@ int board_eth_init(bd_t *bis)
#define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5
#define AR8051_RGMII_TX_CLK_DLY0x100
- if (board_is_evm_sk() || board_is_gp_evm()) {
+ if (board_is_evm_sk() || board_is_gp_evm() || board_is_bben()) {
const char *devname;
devname = miiphy_get_current_dev();
diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h
index 652b10b..48df914 100644
--- a/board/ti/am335x/board.h
+++ b/board/ti/am335x/board.h
@@ -43,9 +43,15 @@ static inline int board_is_bbg1(void)
return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4);
}
+static inline int board_is_bben(void)
+{
+ return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "SE", 2);
+}
+
static inline int board_is_beaglebonex(void)
{
- return board_is_pb() || board_is_bone() || board_is_bone_lt() ||
board_is_bbg1();
+ return board_is_pb() || board_is_bone() || board_is_bone_lt() ||
+ board_is_bbg1() || board_is_bben();
}
static inline int board_is_evm_sk(void)
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index aa18760..41333f9 100644
--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
@@ -380,6 +380,13 @@ void enable_board_pin_mux(void)
configure_module_pin_mux(rgmii1_pin_mux);
configure_module_pin_mux(mmc0_pin_mux_sk_evm);
} else if (board_is_bone_lt()) {
+ if (board_is_bben()) {
+ /* SanCloud Beaglebone LT Enhanced pinmux */
+ configure_module_pin_mux(rgmii1_pin_mux);
+ } else {
+ /* Beaglebone LT pinmux */
+ configure_module_pin_mux(mii1_pin_mux);
+ }
/* Beaglebone LT pinmux */
configure_module_pin_mux(mii1_pin_mux);
configure_module_pin_mux(mmc0_pin_mux);
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index ff87adc..f1aa653 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -153,6 +153,8 @@
"setenv fdtfile am335x-bonegreen-wireless.dtb; fi; " \
"if test $board_name = BBBL; then " \
"setenv fdtfile am335x-boneblue.dtb; fi; " \
+ "if test $board_name = BBEN; then " \
+ "setenv fdtfile am335x-sancloud-bbe.dtb; fi; " \
"if test $board_name = A33515BB; then " \
"setenv fdtfile am335x-evm.dtb; fi; " \
"if test $board_name = A335X_SK; then " \
--
2.0.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] Add Beaglebone Enhanced support
> Op 17 jul. 2018, om 16:06 heeft Peter Robinson het
> volgende geschreven:
>
> On Tue, Jul 17, 2018 at 3:01 PM, Koen Kooi wrote:
>>
[..]
>> --- a/board/ti/am335x/mux.c
>> +++ b/board/ti/am335x/mux.c
>> @@ -381,6 +381,13 @@ void enable_board_pin_mux(void)
>>configure_module_pin_mux(mmc0_pin_mux_sk_evm);
>>} else if (board_is_bone_lt()) {
>>/* Beaglebone LT pinmux */
>
> I think this comment is duplicated below so this one should be
> updated/dropped?
What do you think about moving it below the if statement:
>> + if (board_is_bben()) {
>> + /* SanCloud Beaglebone LT Enhanced pinmux */
>> + configure_module_pin_mux(rgmii1_pin_mux);
>> + } else {
>> + /* Beaglebone LT pinmux */
>> + configure_module_pin_mux(mii1_pin_mux);
>> + }
X marks the spot
>>configure_module_pin_mux(mii1_pin_mux);
>>configure_module_pin_mux(mmc0_pin_mux);
That would make it clear that it’s the LT pinmux again.
I’m fine with dropping it as well.
regards,
Koen
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] Add Beaglebone Enhanced support
The "Beaglebone Enhanced" by Sancloud is based on the Beaglebone Black,
but with the following differences:
* Gigabit capable PHY
* Extra USB hub, optional i2c control
* lps3331ap barometer connected over i2c
* MPU6050 6 axis MEMS accelerometer/gyro connected over i2c
* 1GiB DDR3 RAM
* RTL8723 Wifi/Bluetooth connected over USB
Signed-off-by: Koen Kooi
---
board/ti/am335x/board.c | 6 --
board/ti/am335x/board.h | 8 +++-
board/ti/am335x/mux.c| 7 +++
include/configs/am335x_evm.h | 2 ++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 147ff0b..a359d20 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -725,6 +725,8 @@ int board_late_init(void)
if (board_is_bbg1())
name = "BBG1";
+ if (board_is_bben())
+ name = "BBEN";
set_board_info_env(name);
/*
@@ -870,7 +872,7 @@ int board_eth_init(bd_t *bis)
(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
#ifdef CONFIG_DRIVER_TI_CPSW
- if (board_is_bone() || board_is_bone_lt() ||
+ if (board_is_bone() || board_is_bone_lt() || board_is_bben() ||
board_is_idk()) {
writel(MII_MODE_ENABLE, &cdev->miisel);
cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if =
@@ -906,7 +908,7 @@ int board_eth_init(bd_t *bis)
#define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5
#define AR8051_RGMII_TX_CLK_DLY0x100
- if (board_is_evm_sk() || board_is_gp_evm()) {
+ if (board_is_evm_sk() || board_is_gp_evm() || board_is_bben()) {
const char *devname;
devname = miiphy_get_current_dev();
diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h
index 652b10b..48df914 100644
--- a/board/ti/am335x/board.h
+++ b/board/ti/am335x/board.h
@@ -43,9 +43,15 @@ static inline int board_is_bbg1(void)
return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "BBG1", 4);
}
+static inline int board_is_bben(void)
+{
+ return board_is_bone_lt() && !strncmp(board_ti_get_rev(), "SE", 2);
+}
+
static inline int board_is_beaglebonex(void)
{
- return board_is_pb() || board_is_bone() || board_is_bone_lt() ||
board_is_bbg1();
+ return board_is_pb() || board_is_bone() || board_is_bone_lt() ||
+ board_is_bbg1() || board_is_bben();
}
static inline int board_is_evm_sk(void)
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index aa18760..f38424d 100644
--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
@@ -381,6 +381,13 @@ void enable_board_pin_mux(void)
configure_module_pin_mux(mmc0_pin_mux_sk_evm);
} else if (board_is_bone_lt()) {
/* Beaglebone LT pinmux */
+ if (board_is_bben()) {
+ /* SanCloud Beaglebone LT Enhanced pinmux */
+ configure_module_pin_mux(rgmii1_pin_mux);
+ } else {
+ /* Beaglebone LT pinmux */
+ configure_module_pin_mux(mii1_pin_mux);
+ }
configure_module_pin_mux(mii1_pin_mux);
configure_module_pin_mux(mmc0_pin_mux);
#if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index ff87adc..f1aa653 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -153,6 +153,8 @@
"setenv fdtfile am335x-bonegreen-wireless.dtb; fi; " \
"if test $board_name = BBBL; then " \
"setenv fdtfile am335x-boneblue.dtb; fi; " \
+ "if test $board_name = BBEN; then " \
+ "setenv fdtfile am335x-sancloud-bbe.dtb; fi; " \
"if test $board_name = A33515BB; then " \
"setenv fdtfile am335x-evm.dtb; fi; " \
"if test $board_name = A335X_SK; then " \
--
2.0.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [linux-sunxi] [PATCH] sunxi: Fix gmac not working reliable on the Bananapi
Op 30 sep. 2014, om 14:02 heeft Hans de Goede het volgende geschreven: > Hi, > > On 09/29/2014 08:35 PM, jonsm...@gmail.com wrote: >> On Mon, Sep 29, 2014 at 2:16 PM, Karsten Merker wrote: >>> On Mon, Sep 29, 2014 at 09:13:37AM +0300, Siarhei Siamashka wrote: How did you come to the idea to poke these bits? >>> >>> The linux 3.4 kernel from https://github.com/LeMaker/linux-bananapi >>> (which is a patched linux-sunxi.org 3.4 kernel) does not show this >>> problem, so we started looking into what is different there, and the >>> relevant change that was found was setting these particular >>> undocumented bits. >> >> File at issue here asking for the documentation >> https://github.com/allwinner-zh/documents > > I'm already talking to Allwinner about this, it seems that bits > 10-11, or more likely 10-12 of the gmac clk register are the tx > equivalent of bits 5-7, "Configure GMAC receive clock delay > chain". I think this is there to deal with the pcb data and clk > traces not having the same length, so that this is highly board > specific. I'm waiting on confirmation on this from Allwinner, > as well as some info on the unit of this 0-7 value. Gbit ethernet requires a delay between the lines, which you can implement by adding 10cm or so extra trace on the PCB or tell the MAC or PHY to do it in software. Very board specific, but so far I've only seen Intel reference designs use the extra trace length method most arm/ppc/mips gbit boards use a PHY that handles it in hardware on request like the GMAC is doing above. regards, Koen ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [linux-sunxi] [PATCH] video: add cfb console driver for sunxi
Op 5 aug. 2014, om 23:37 heeft Michal Suchanek het volgende geschreven: > On 5 August 2014 23:03, Maxime Ripard > wrote: >> On Mon, Aug 04, 2014 at 05:05:00PM +0200, Luc Verhaegen wrote: >>> On Mon, Aug 04, 2014 at 10:39:13AM +0200, Hans de Goede wrote: Hi Luc, First of all many thanks for your work on this. ATM I don't have time to do a full review, but I don't expect there to be too many suprises when I do find the time. Really my only concern is the handover of the reserved memory, etc. to the kernel. We need to get a plan in place for that *before* this can be merged. Note I don't want to raise any artificial barriers here, I would love to see this merged ASAP. But I don't want to paint us in a corner where u-boot having hdmi console support makes it harder to get kms support in the kernel going. I think we can both agree on that. So I really want to see some plan how this will work in place before merging. Note just a plan, I don't expect kernel patches ready to be merged for this, just a good idea / sketch of how all the bits will fit together. >>> >>> Memory is not the biggest worry. >>> >>> Some kernel code needs to claim clocks if the mode is to cleanly survive >>> the start of the kernel. If not, there is no coming back until a proper >>> display driver runs. If the simplefb driver claims these clocks, then >>> the simplefb driver also must release these clocks, and this driver >>> should then never be started again, so it should set the simplefb dt >>> node status to "disabled". >> >> I'm probably missing a bit of context, but one thing I still don't get >> is why you're taking into account the simplefb <-> KMS handover. It's >> a case that shouldn't exist. >> >> By essence, simplefb has never been meant for that. It's been meant to >> have a temporary solution until a full-fledged driver is merged in the >> kernel. Which is exactly the case we're into. > > It's a permanent temporary solution. Same as offb/vesafb/uefi and > other unaccelerated drivers. It will be needed for platforms on which > KMS is not (yet) fully supported or happens to break. > > Also how else do you express the fact that u-boot has left the display > enabled other than generating the simplefb DT node? > > Note that the KMS driver will be probably unsuitable for early console > while the simplefb driver can just write into the framebuffer set up > by u-boot. Both simplefb and the potention sunxifb will be using the same kernel infrastructure and start printing at the same time, so your argument about simplefb being able to print 'earlier' is nonsense. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [linux-sunxi] [PATCH v3 0/4] uboot sata support for sunxi platform
Op 12 mrt. 2014, om 13:56 heeft Ian Campbell het volgende geschreven: > On Wed, 2014-03-12 at 05:43 -0700, Ezaul Zillmer wrote: > > I'm afraid much of your mail was incomprehensible to me. > >> setenv bootargs console = tty0 console = ttyS0, 115200 = hdmi.audio >> EDID: 0 = disp.screen0_output_mode EDID: 1280x800p60 root = / dev/sda1 >> rootfstype = ext4 rootwait panic = 10 >> ext4load 0 0x4300 scsi boot / script.bin >> ext4load 0 0x4600 scsi boot / uImage >> ext4load scsi 0 0x4900 boot/cubie2.dtb > > The first two and the last one are using a totally different syntax, > only one of them can be correct, I suggest you check the uboot help/docs > and experiment by hand on the uboot console before trying to construct a > boot.scr. I've noticed 'ext4load' twice today, once in the mail above and once in the 'fedora on panda' blog post. What's stopping people from using the generic 'fsload' commands? regards, Koen ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v15] Introduced btrfs file-system with btrload command
From: Adnan Ali
Introduces btrfs file-system to read file from
volume/sub-volumes with btrload command. This
implementation has read-only support.
This btrfs implementation is based on syslinux btrfs
code.
v15: add $(PLATFORM_NO_UNALIGNED) to CFLAGS
v14: Merge conflicts, makefile updates and do_load API changes
v13: Added pre-calculated crc for BE & LE
v11: Mirro super block check.
v10: patch problem reworked.
v5: merged with master.
v4: btrls command added.
[port of syslinux commit 269ebc845ebc8b46ef4b0be7fa0005c7fdb95b8d]
Signed-off-by: Adnan Ali
Signed-off-by: Koen Kooi
---
Slightly better:
U-Boot# btrls mmc 1:2
root
U-Boot# help btrls
btrls - list files in a directory (default /)
Usage:
btrls [] [directory]
- list files from 'dev' on 'interface' in a 'directory'
U-Boot# btrls mmc 1:2 /root/boot
data abort
MAYBE you should read doc/README.arm-unaligned-accesses
pc : [<9f758534>] lr : [<9f77b51c>]
sp : 9f628d80 ip : 04f0 fp : 9f629618
r10: 0014 r9 : 9f628f28 r8 : 9f629a40
r7 : 9f629948 r6 : 9ffba794 r5 : 9f79cd80 r4 : 69697073
r3 : 00697073 r2 : 0069 r1 : 9f629918 r0 : 69697073
Flags: nzCv IRQs off FIQs on Mode SVC_32
Resetting CPU ...
reloc off = 0x1EF49000
[koen@rrmbp u-boot]$ arm-angstrom-linux-gnueabi-addr2line -f -e u-boot
0x8080F534
free
/mnt/wwn-0x50004cf20775efdb-part2/u-boot/common/dlmalloc.c:2460
common/Makefile|1 +
common/cmd_btr.c | 65 +++
fs/Makefile|1 +
fs/btrfs/Makefile | 15 +
fs/btrfs/btrfs.c | 1336
fs/fs.c| 10 +
include/btrfs.h| 417 ++
include/config_fallbacks.h |4 +
include/crc.h |5 +
include/fs.h |1 +
lib/Makefile |1 +
lib/crc32_c.c | 108
12 files changed, 1964 insertions(+)
create mode 100644 common/cmd_btr.c
create mode 100644 fs/btrfs/Makefile
create mode 100644 fs/btrfs/btrfs.c
create mode 100644 include/btrfs.h
create mode 100644 lib/crc32_c.c
diff --git a/common/Makefile b/common/Makefile
index 74404be..6025a12 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -57,6 +57,7 @@ obj-$(CONFIG_CMD_BMP) += cmd_bmp.o
obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o
obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o
obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o
+obj-$(CONFIG_CMD_BTR) += cmd_btr.o
obj-$(CONFIG_CMD_CACHE) += cmd_cache.o
obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o
obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o
diff --git a/common/cmd_btr.c b/common/cmd_btr.c
new file mode 100644
index 000..02a4bf1
--- /dev/null
+++ b/common/cmd_btr.c
@@ -0,0 +1,65 @@
+/*
+ * (C) Copyright 2013 Codethink Limited
+ * Btrfs port to Uboot by
+ * Adnan Ali
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * Boot support
+ */
+#include
+#include
+
+char subvolname[BTRFS_MAX_SUBVOL_NAME];
+
+int do_btr_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ if (argc > 5)
+ strcpy(subvolname, argv[5]);
+ else
+ subvolname[0] = '\0';
+
+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_BTR);
+}
+
+
+U_BOOT_CMD(
+btrload,7, 0, do_btr_fsload,
+ "load binary file from a btr filesystem",
+ " [][subvol_name]\n"
+ "- Load binary file 'filename' from 'dev' on 'interface'\n"
+ " to address 'addr' from better filesystem.\n"
+ " the load stops on end of file.\n"
+ " subvol_name is used read that file from this subvolume.\n"
+ " All numeric parameters are assumed to be hex."
+);
+
+static int do_btr_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ return do_ls(cmdtp, flag, argc, argv, FS_TYPE_BTR);
+}
+
+U_BOOT_CMD(
+ btrls, 4, 1, do_btr_ls,
+ "list files in a directory (default /)",
+ " [] [directory]\n"
+
[U-Boot] [PATCH v14] Introduced btrfs file-system with btrload command
From: Adnan Ali
Introduces btrfs file-system to read file from
volume/sub-volumes with btrload command. This
implementation has read-only support.
This btrfs implementation is based on syslinux btrfs
code.
v14: Merge conflicts, makefile updates and do_load API changes
v13: Added pre-calculated crc for BE & LE
v11: Mirro super block check.
v10: patch problem reworked.
v5: merged with master.
v4: btrls command added.
[port of syslinux commit 269ebc845ebc8b46ef4b0be7fa0005c7fdb95b8d]
Signed-off-by: Adnan Ali
Signed-off-by: Koen Kooi
---
Doesn't work for me on armv7a:
U-Boot# ls mmc 1:1
104092 mlo
388916 u-boot.img
92 uenv.txt
4718096 zimage
86 uenv.txt~
boot/
5 file(s), 1 dir(s)
U-Boot# ls mmc 1:2
Failed to mount ext2 filesystem...
data abort
MAYBE you should read doc/README.arm-unaligned-accesses
pc : [<9f77e6a4>] lr : [<9f77d558>]
sp : 9f62cda8 ip : 9f633718 fp : 9f62d5f0
r10: 9f7a40bc r9 : 9f62cf28 r8 : 9ffecd38
r7 : 9f7a2a24 r6 : 9ffbc088 r5 : 9ffbbfbc r4 : 0061
r3 : 9ffbc425 r2 : 9ffbc411 r1 : r0 : 9f62cda8
Flags: Nzcv IRQs off FIQs on Mode SVC_32
Resetting CPU ...
U-Boot# btrls mmc 1:2
data abort
MAYBE you should read doc/README.arm-unaligned-accesses
pc : [<9f77e6a4>] lr : [<9f75bf40>]
sp : 9f62cda8 ip : 9f633718 fp : 9f62d5f0
r10: 9f7a40bc r9 : 9f62cf28 r8 : 9ffecd38
r7 : 9f7a2a24 r6 : 9ffbc088 r5 : 9ffbbfbc r4 : 0061
r3 : 9ffbc425 r2 : 9ffbc411 r1 : r0 : 9f62cda8
Flags: Nzcv IRQs off FIQs on Mode SVC_32
It's not unaligned access since I have Mans' patch that removes this bit:
orr r0, r0, #0x0002 @ set bit 1 (--A-) Align
Anyway, I updated this patch so it applies and builds again, someone will have
to debug the data abort.
common/Makefile|1 +
common/cmd_btr.c | 65 +++
fs/Makefile|1 +
fs/btrfs/Makefile | 12 +
fs/btrfs/btrfs.c | 1336
fs/fs.c| 10 +
include/btrfs.h| 417 ++
include/config_fallbacks.h |4 +
include/crc.h |5 +
include/fs.h |1 +
lib/Makefile |1 +
lib/crc32_c.c | 108
12 files changed, 1961 insertions(+)
create mode 100644 common/cmd_btr.c
create mode 100644 fs/btrfs/Makefile
create mode 100644 fs/btrfs/btrfs.c
create mode 100644 include/btrfs.h
create mode 100644 lib/crc32_c.c
diff --git a/common/Makefile b/common/Makefile
index 74404be..6025a12 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -57,6 +57,7 @@ obj-$(CONFIG_CMD_BMP) += cmd_bmp.o
obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o
obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o
obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o
+obj-$(CONFIG_CMD_BTR) += cmd_btr.o
obj-$(CONFIG_CMD_CACHE) += cmd_cache.o
obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o
obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o
diff --git a/common/cmd_btr.c b/common/cmd_btr.c
new file mode 100644
index 000..02a4bf1
--- /dev/null
+++ b/common/cmd_btr.c
@@ -0,0 +1,65 @@
+/*
+ * (C) Copyright 2013 Codethink Limited
+ * Btrfs port to Uboot by
+ * Adnan Ali
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * Boot support
+ */
+#include
+#include
+
+char subvolname[BTRFS_MAX_SUBVOL_NAME];
+
+int do_btr_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ if (argc > 5)
+ strcpy(subvolname, argv[5]);
+ else
+ subvolname[0] = '\0';
+
+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_BTR);
+}
+
+
+U_BOOT_CMD(
+btrload,7, 0, do_btr_fsload,
+ "load binary file from a btr filesystem",
+ " [][subvol_name]\n"
+ "- Load binary file 'filename' from 'dev' on 'interface'\n"
+ " to address 'addr' from better filesystem.\n"
+ " the load stops on end of file.\n"
+ " subvol_name is used
Re: [U-Boot] [PATCH V3 5/6] omap3_beagle: support findfdt and loadfdt for devicetree support
Op 15 jul. 2013, om 16:49 heeft Tom Rini het volgende geschreven:
> On Mon, Jul 15, 2013 at 02:16:50PM +0200, Koen Kooi wrote:
>>
>> Op 15 jul. 2013, om 14:11 heeft Nishanth Menon het volgende
>> geschreven:
>>
>>> For folks not using concatenated device tree with uImage, having
>>> an handy function to find and load device tree is very handy.
>>>
>>> So introduce findfdt and loadfdt and run findfdt by default to make
>>> it easier on user scripts.
>>>
>>> Signed-off-by: Nishanth Menon
>>> ---
>>> V3: Fixes typo mistake reported in
>>> http://marc.info/?t=13735821236&r=1&w=2
>>>
>>> include/configs/omap3_beagle.h | 15 +++
>>> 1 file changed, 15 insertions(+)
>>>
>>> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
>>> index bdeee17..5ec8ade 100644
>>> --- a/include/configs/omap3_beagle.h
>>> +++ b/include/configs/omap3_beagle.h
>>> @@ -210,6 +210,8 @@
>>> #define CONFIG_EXTRA_ENV_SETTINGS \
>>> "loadaddr=0x8020\0" \
>>> "rdaddr=0x8100\0" \
>>> + "fdt_high=0x\0" \
>>> + "fdtaddr=0x80f8\0" \
>>> "usbtty=cdc_acm\0" \
>>> "bootfile=uImage\0" \
>>> "ramdisk=ramdisk.gz\0" \
>>> @@ -250,6 +252,17 @@
>>> "omapdss.def_disp=${defaultdisplay} " \
>>> "root=${nandroot} " \
>>> "rootfstype=${nandrootfstype}\0" \
>>> + "findfdt=" \
>>> + "if test $beaglerev = AxBx; then " \
>>> + "setenv fdtfile omap3-beagle.dtb; fi; " \
>>> + "if test $beaglerev = Cx; then " \
>>> + "setenv fdtfile omap3-beagle.dtb; fi; " \
>>> + "if test $beaglerev = xMAB; then " \
>>> + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
>>> + "if test $beaglerev = xMC; then " \
>>> + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
>>> + "if test $fdtfile = undefined; then " \
>>> + "echo WARNING: Could not determine device tree to use;
>>> fi; \0" \
>>
>> With the remote chance of a future xM rev D, can you make the
>> fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?
>
> I don't like that idea. On am335x_evm configs we have undefined and
> then say "hey, it's undefined!" so it's clear that we don't know what to
> do. That in theory future xM rev D might need a different device tree
> for example.
And that's patched out on the build that actually ships with the beaglebone and
beaglebone black so it will fall back to BBB when it can't ID the board. You'll
see that the u-boot bits that need the ID for the xM also fallback to the
latest rev. I don't see why the boardfile and script need to have different
behaviour.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 5/6] omap3_beagle: support findfdt and loadfdt for devicetree support
Op 15 jul. 2013, om 14:25 heeft Nishanth Menon het volgende
geschreven:
> On 14:16-20130715, Koen Kooi wrote:
>>
>> Op 15 jul. 2013, om 14:11 heeft Nishanth Menon het volgende
>> geschreven:
>>
>>> For folks not using concatenated device tree with uImage, having
>>> an handy function to find and load device tree is very handy.
>>>
>>> So introduce findfdt and loadfdt and run findfdt by default to make
>>> it easier on user scripts.
>>>
>>> Signed-off-by: Nishanth Menon
>>> ---
>>> V3: Fixes typo mistake reported in
>>> http://marc.info/?t=13735821236&r=1&w=2
>>>
>>> include/configs/omap3_beagle.h | 15 +++
>>> 1 file changed, 15 insertions(+)
>>>
>>> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
>>> index bdeee17..5ec8ade 100644
>>> --- a/include/configs/omap3_beagle.h
>>> +++ b/include/configs/omap3_beagle.h
>>> @@ -210,6 +210,8 @@
>>> #define CONFIG_EXTRA_ENV_SETTINGS \
>>> "loadaddr=0x8020\0" \
>>> "rdaddr=0x8100\0" \
>>> + "fdt_high=0x\0" \
>>> + "fdtaddr=0x80f8\0" \
>>> "usbtty=cdc_acm\0" \
>>> "bootfile=uImage\0" \
>>> "ramdisk=ramdisk.gz\0" \
>>> @@ -250,6 +252,17 @@
>>> "omapdss.def_disp=${defaultdisplay} " \
>>> "root=${nandroot} " \
>>> "rootfstype=${nandrootfstype}\0" \
>>> + "findfdt=" \
>>> + "if test $beaglerev = AxBx; then " \
>>> + "setenv fdtfile omap3-beagle.dtb; fi; " \
>>> + "if test $beaglerev = Cx; then " \
>>> + "setenv fdtfile omap3-beagle.dtb; fi; " \
>>> + "if test $beaglerev = xMAB; then " \
>>> + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
>>> + "if test $beaglerev = xMC; then " \
>>> + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
>>> + "if test $fdtfile = undefined; then " \
>>> + "echo WARNING: Could not determine device tree to use;
>>> fi; \0" \
>>
>> With the remote chance of a future xM rev D, can you make the fallthrough be
>> 'omap3-beagle-xm.dtb' intead of 'undefined'?
> Lets add the detection of xMD and along with that we add
> omap3-beagle-xm.dtb detection - makes sense? OR do we assume all
> un-matched devices default to beagle xMD? what if there was a vanilla
> beagle rev D?
The fallthrough case should always be the most recent board rev, any other way
will just make the HW guys spoof the ID in the design and we all know how that
ends :(
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 5/6] omap3_beagle: support findfdt and loadfdt for devicetree support
Op 15 jul. 2013, om 14:11 heeft Nishanth Menon het volgende
geschreven:
> For folks not using concatenated device tree with uImage, having
> an handy function to find and load device tree is very handy.
>
> So introduce findfdt and loadfdt and run findfdt by default to make
> it easier on user scripts.
>
> Signed-off-by: Nishanth Menon
> ---
> V3: Fixes typo mistake reported in http://marc.info/?t=13735821236&r=1&w=2
>
> include/configs/omap3_beagle.h | 15 +++
> 1 file changed, 15 insertions(+)
>
> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
> index bdeee17..5ec8ade 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -210,6 +210,8 @@
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "loadaddr=0x8020\0" \
> "rdaddr=0x8100\0" \
> + "fdt_high=0x\0" \
> + "fdtaddr=0x80f8\0" \
> "usbtty=cdc_acm\0" \
> "bootfile=uImage\0" \
> "ramdisk=ramdisk.gz\0" \
> @@ -250,6 +252,17 @@
> "omapdss.def_disp=${defaultdisplay} " \
> "root=${nandroot} " \
> "rootfstype=${nandrootfstype}\0" \
> + "findfdt=" \
> + "if test $beaglerev = AxBx; then " \
> + "setenv fdtfile omap3-beagle.dtb; fi; " \
> + "if test $beaglerev = Cx; then " \
> + "setenv fdtfile omap3-beagle.dtb; fi; " \
> + "if test $beaglerev = xMAB; then " \
> + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
> + "if test $beaglerev = xMC; then " \
> + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
> + "if test $fdtfile = undefined; then " \
> + "echo WARNING: Could not determine device tree to use;
> fi; \0" \
With the remote chance of a future xM rev D, can you make the fallthrough be
'omap3-beagle-xm.dtb' intead of 'undefined'?
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] am335x_evm: add support for BeagleBone Black DT name
Op 13 mrt. 2013, om 21:19 heeft Matt Porter het volgende geschreven: > On Wed, Mar 13, 2013 at 08:02:26PM +0100, Koen Kooi wrote: >> >> Op 13 mrt. 2013, om 16:07 heeft Nishanth Menon het volgende >> geschreven: >> >>> On 16:05-20130313, Koen Kooi wrote: >>>> >>>> Op 13 mrt. 2013, om 16:02 heeft Nishanth Menon het volgende >>>> geschreven: >>>> >>>>> On Wed, Mar 13, 2013 at 9:57 AM, Koen Kooi >>>>> wrote: >>>>>> >>>>>> Op 13 mrt. 2013, om 15:35 heeft Nishanth Menon het >>>>>> volgende geschreven: >>>>>> >>>>>>> On 10:20-20130313, Tom Rini wrote: >>>>>>>> From: Koen Kooi >>>>>>>> >>>>>>>> Signed-off-by: Koen Kooi >>>>>>>> Acked-by: Peter Korsgaard >>>>>>>> --- >>>>>>>> include/configs/am335x_evm.h |2 ++ >>>>>>>> 1 file changed, 2 insertions(+) >>>>>>>> >>>>>>>> diff --git a/include/configs/am335x_evm.h >>>>>>>> b/include/configs/am335x_evm.h >>>>>>>> index 33ee2c4..abf4e39 100644 >>>>>>>> --- a/include/configs/am335x_evm.h >>>>>>>> +++ b/include/configs/am335x_evm.h >>>>>>>> @@ -87,6 +87,8 @@ >>>>>>>> "findfdt="\ >>>>>>>> "if test $board_name = A335BONE; then " \ >>>>>>>> "setenv fdtfile am335x-bone.dtb; fi; " \ >>>>>>>> +"if test $board_name = A335BNLT; then " \ >>>>>>>> +"setenv fdtfile am335x-bonelt.dtb; fi; " \ >>>>>>> could we not use am335x-boneblack.dtb instead? >>>>>> >>>>>> it's bonelt in the kernel, so boneblack would fail to load a dtb >>>>> $ git describe >>>>> v3.9-rc2 >>>>> $ ls arch/arm/boot/dts/*bone*.dts* >>>>> arch/arm/boot/dts/am335x-bone.dts >>>>> ??? >>>> >>>> What a surprise, missing stuff in mainline! It's present in the vendor >>>> kernel, which is what is shipping with the board. >>> No surprise there as marketing names are finalized close to product >>> launches. If there is an vendor u-boot, it can remain in sync with what >>> ever the vendor kernel is. If it is upstream, we might want to think >>> longterm. >> >> I'm in charge of pushing the am335x-bonelt.dts upstream to Linus and I'd >> like to keep everything in sync. I'm not fond of renaming it again, the >> EEPROM says BNLT, not BNB :) > > That's a horrible reason to confuse users. The EEPROM contents are > irrelevant. Users look for something to match the board name, this > does not. It's wrong. It is stupid, but that's what you get for renaming boards. The real problem with this is that it is a flag day, the kernel and u-boot need to change both at the same time. And after that you'll have a mismatch if you use different versions. Anyway, patches welcome for the vendor kernel to rename it. regards, Koen ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] am335x_evm: add support for BeagleBone Black DT name
Op 13 mrt. 2013, om 16:07 heeft Nishanth Menon het volgende geschreven: > On 16:05-20130313, Koen Kooi wrote: >> >> Op 13 mrt. 2013, om 16:02 heeft Nishanth Menon het volgende >> geschreven: >> >>> On Wed, Mar 13, 2013 at 9:57 AM, Koen Kooi >>> wrote: >>>> >>>> Op 13 mrt. 2013, om 15:35 heeft Nishanth Menon het volgende >>>> geschreven: >>>> >>>>> On 10:20-20130313, Tom Rini wrote: >>>>>> From: Koen Kooi >>>>>> >>>>>> Signed-off-by: Koen Kooi >>>>>> Acked-by: Peter Korsgaard >>>>>> --- >>>>>> include/configs/am335x_evm.h |2 ++ >>>>>> 1 file changed, 2 insertions(+) >>>>>> >>>>>> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h >>>>>> index 33ee2c4..abf4e39 100644 >>>>>> --- a/include/configs/am335x_evm.h >>>>>> +++ b/include/configs/am335x_evm.h >>>>>> @@ -87,6 +87,8 @@ >>>>>>"findfdt="\ >>>>>>"if test $board_name = A335BONE; then " \ >>>>>>"setenv fdtfile am335x-bone.dtb; fi; " \ >>>>>> +"if test $board_name = A335BNLT; then " \ >>>>>> +"setenv fdtfile am335x-bonelt.dtb; fi; " \ >>>>> could we not use am335x-boneblack.dtb instead? >>>> >>>> it's bonelt in the kernel, so boneblack would fail to load a dtb >>> $ git describe >>> v3.9-rc2 >>> $ ls arch/arm/boot/dts/*bone*.dts* >>> arch/arm/boot/dts/am335x-bone.dts >>> ??? >> >> What a surprise, missing stuff in mainline! It's present in the vendor >> kernel, which is what is shipping with the board. > No surprise there as marketing names are finalized close to product > launches. If there is an vendor u-boot, it can remain in sync with what > ever the vendor kernel is. If it is upstream, we might want to think > longterm. I'm in charge of pushing the am335x-bonelt.dts upstream to Linus and I'd like to keep everything in sync. I'm not fond of renaming it again, the EEPROM says BNLT, not BNB :) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] am335x_evm: add support for BeagleBone Black DT name
Op 13 mrt. 2013, om 16:02 heeft Nishanth Menon het volgende geschreven: > On Wed, Mar 13, 2013 at 9:57 AM, Koen Kooi wrote: >> >> Op 13 mrt. 2013, om 15:35 heeft Nishanth Menon het volgende >> geschreven: >> >>> On 10:20-20130313, Tom Rini wrote: >>>> From: Koen Kooi >>>> >>>> Signed-off-by: Koen Kooi >>>> Acked-by: Peter Korsgaard >>>> --- >>>> include/configs/am335x_evm.h |2 ++ >>>> 1 file changed, 2 insertions(+) >>>> >>>> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h >>>> index 33ee2c4..abf4e39 100644 >>>> --- a/include/configs/am335x_evm.h >>>> +++ b/include/configs/am335x_evm.h >>>> @@ -87,6 +87,8 @@ >>>> "findfdt="\ >>>> "if test $board_name = A335BONE; then " \ >>>> "setenv fdtfile am335x-bone.dtb; fi; " \ >>>> +"if test $board_name = A335BNLT; then " \ >>>> +"setenv fdtfile am335x-bonelt.dtb; fi; " \ >>> could we not use am335x-boneblack.dtb instead? >> >> it's bonelt in the kernel, so boneblack would fail to load a dtb > $ git describe > v3.9-rc2 > $ ls arch/arm/boot/dts/*bone*.dts* > arch/arm/boot/dts/am335x-bone.dts > ??? What a surprise, missing stuff in mainline! It's present in the vendor kernel, which is what is shipping with the board. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] am335x_evm: add support for BeagleBone Black DT name
Op 13 mrt. 2013, om 15:35 heeft Nishanth Menon het volgende geschreven: > On 10:20-20130313, Tom Rini wrote: >> From: Koen Kooi >> >> Signed-off-by: Koen Kooi >> Acked-by: Peter Korsgaard >> --- >> include/configs/am335x_evm.h |2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h >> index 33ee2c4..abf4e39 100644 >> --- a/include/configs/am335x_evm.h >> +++ b/include/configs/am335x_evm.h >> @@ -87,6 +87,8 @@ >> "findfdt="\ >> "if test $board_name = A335BONE; then " \ >> "setenv fdtfile am335x-bone.dtb; fi; " \ >> +"if test $board_name = A335BNLT; then " \ >> +"setenv fdtfile am335x-bonelt.dtb; fi; " \ > could we not use am335x-boneblack.dtb instead? it's bonelt in the kernel, so boneblack would fail to load a dtb Koen ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/3] am335x-evm: add support for BeagleBone Black DT name
Op 17 feb. 2013 om 14:06 heeft Peter Korsgaard het volgende geschreven: >>>>>> "Koen" == Koen Kooi writes: > > Koen> Signed-off-by: Koen Kooi > Koen> --- > Koen> include/configs/am335x_evm.h | 2 ++ > Koen> 1 file changed, 2 insertions(+) > > Koen> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > Koen> index 2190a7d..951422c 100644 > Koen> --- a/include/configs/am335x_evm.h > Koen> +++ b/include/configs/am335x_evm.h > Koen> @@ -86,6 +86,8 @@ > Koen> "findfdt="\ > Koen> "if test $board_name = A335BONE; then " \ > Koen> "setenv fdtfile am335x-bone.dtb; fi; " \ > Koen> +"if test $board_name = A335BNLT; then " \ > Koen> +"setenv fdtfile am335x-bonelt.dtb; fi; " \ > > Where does the 'bonelt' name come from? Seems quite far from bone black > to me. It's the old name for it, it's also used in the eeprom > > Other than that it looks fine. > > Acked-by: Peter Korsgaard > > -- > Bye, Peter Korsgaard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] am335x-evm: enable ext4
Op 17 feb. 2013 om 14:03 heeft Peter Korsgaard het volgende geschreven: >>>>>> "Koen" == Koen Kooi writes: > > Koen> The kernel is loaded from an ext4 partition, not ext2 on beaglebone > boards. > Koen> Signed-off-by: Koen Kooi > Koen> --- > Koen> include/configs/am335x_evm.h | 1 + > Koen> 1 file changed, 1 insertion(+) > > Koen> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > Koen> index 72459d8..2190a7d 100644 > Koen> --- a/include/configs/am335x_evm.h > Koen> +++ b/include/configs/am335x_evm.h > Koen> @@ -144,6 +144,7 @@ > Koen> #define CONFIG_DOS_PARTITION > Koen> #define CONFIG_CMD_FAT > Koen> #define CONFIG_CMD_EXT2 > Koen> +#define CONFIG_CMD_EXT4 > > Shouldn't the bootcmd then also be changed to use ext4load instead? Why > keep CMD_EXT2 enabled? that will be a followup patch > > -- > Bye, Peter Korsgaard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 3/3] am335x-evm: switch to DT boot
The findfdt method is being used to locate the right .dtb for the board and
load it from /boot.
Signed-off-by: Koen Kooi
---
include/configs/am335x_evm.h | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 951422c..67f04c4 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -79,7 +79,7 @@
"loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
- "bootm ${loadaddr}\0" \
+ "bootm ${loadaddr} - ${fdtaddr}\0" \
"ramboot=echo Booting from ramdisk ...; " \
"run ramargs; " \
"bootm ${loadaddr}\0" \
@@ -93,7 +93,9 @@
"if test $board_name = A335X_SK; then " \
"setenv fdtfile am335x-evmsk.dtb; fi\0" \
+
#define CONFIG_BOOTCOMMAND \
+ "run findfdt; " \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"echo SD/MMC found on device ${mmcdev};" \
"if run loadbootenv; then " \
@@ -105,6 +107,7 @@
"run uenvcmd;" \
"fi;" \
"if run loaduimage; then " \
+ "ext2load mmc ${mmcdev}:2 ${fdtaddr} /boot/${fdtfile};
" \
"run mmcboot;" \
"fi;" \
"fi;" \
--
1.8.1.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/3] am335x-evm: enable ext4
The kernel is loaded from an ext4 partition, not ext2 on beaglebone boards. Signed-off-by: Koen Kooi --- include/configs/am335x_evm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 72459d8..2190a7d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -144,6 +144,7 @@ #define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 #define CONFIG_SPI #define CONFIG_OMAP3_SPI -- 1.8.1.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/3] am335x-evm: add support for BeagleBone Black DT name
Signed-off-by: Koen Kooi --- include/configs/am335x_evm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2190a7d..951422c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -86,6 +86,8 @@ "findfdt="\ "if test $board_name = A335BONE; then " \ "setenv fdtfile am335x-bone.dtb; fi; " \ + "if test $board_name = A335BNLT; then " \ + "setenv fdtfile am335x-bonelt.dtb; fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ -- 1.8.1.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] am335x-evm: enable ext4
The kernel is loaded from an ext4 partition, not ext2 on beaglebone boards. Signed-off-by: Koen Kooi --- include/configs/am335x_evm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 72459d8..2190a7d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -144,6 +144,7 @@ #define CONFIG_DOS_PARTITION #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 #define CONFIG_SPI #define CONFIG_OMAP3_SPI -- 1.8.1.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] am335x-evm: add support for BeagleBone Black DT name
Signed-off-by: Koen Kooi --- include/configs/am335x_evm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2190a7d..951422c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -86,6 +86,8 @@ "findfdt="\ "if test $board_name = A335BONE; then " \ "setenv fdtfile am335x-bone.dtb; fi; " \ + "if test $board_name = A335BNLT; then " \ + "setenv fdtfile am335x-bonelt.dtb; fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ -- 1.8.1.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] am335x: add mux config for DDR3 version of beaglebone
This fixes the following boothang in SPL:
Unknown board, cannot configure pinmux.### ERROR ### Please RESET the
board ###
Future commits will add pinmuxes for more on-board peripherals.
Signed-off-by: Koen Kooi
---
board/ti/am335x/mux.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index 80becd5..73d2173 100644
--- a/board/ti/am335x/mux.c
+++ b/board/ti/am335x/mux.c
@@ -448,6 +448,12 @@ void enable_board_pin_mux(struct am335x_baseboard_id
*header)
configure_module_pin_mux(gpio0_7_pin_mux);
configure_module_pin_mux(rgmii1_pin_mux);
configure_module_pin_mux(mmc0_pin_mux_sk_evm);
+ } else if (!strncmp(header->name, "A335BNLT", HDR_NAME_LEN)) {
+ /* Beaglebone LT pinmux */
+ configure_module_pin_mux(i2c1_pin_mux);
+ configure_module_pin_mux(mii1_pin_mux);
+ configure_module_pin_mux(mmc0_pin_mux);
+ configure_module_pin_mux(mmc1_pin_mux);
} else {
puts("Unknown board, cannot configure pinmux.");
hang();
--
1.7.7.6
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] am335x-evm config: decrease bootdelay to 1s and mount rootfs RO
A fast boot is important to the beaglebone, so save 2 seconds here by
decreasing bootdelay. This is still plenty time to break into the prompt,
I do that at least once a day.
Mount the rootfs RO by default, this is needed to make fsck succeed
without resorting to an initramfs.
Signed-off-by: Koen Kooi
---
include/configs/am335x_evm.h |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index a3752bc..8c63409 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -45,7 +45,7 @@
#define CONFIG_VERSION_VARIABLE
/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY 3
+#define CONFIG_BOOTDELAY 1
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x8020\0" \
"fdtaddr=0x80F8\0" \
@@ -54,7 +54,7 @@
"console=ttyO0,115200n8\0" \
"optargs=\0" \
"mmcdev=0\0" \
- "mmcroot=/dev/mmcblk0p2 rw\0" \
+ "mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
"ramrootfstype=ext2\0" \
--
1.7.7.6
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] omap4 i2c: add support for i2c bus 4
Signed-off-by: Koen Kooi
---
arch/arm/include/asm/arch-omap4/cpu.h |1 +
arch/arm/include/asm/arch-omap4/i2c.h |2 +-
drivers/i2c/omap24xx_i2c.c|8
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/arch/arm/include/asm/arch-omap4/cpu.h
b/arch/arm/include/asm/arch-omap4/cpu.h
index a8c4c60..3a0bfbf 100644
--- a/arch/arm/include/asm/arch-omap4/cpu.h
+++ b/arch/arm/include/asm/arch-omap4/cpu.h
@@ -138,6 +138,7 @@ struct watchdog {
#define I2C_BASE1 (OMAP44XX_L4_PER_BASE + 0x7)
#define I2C_BASE2 (OMAP44XX_L4_PER_BASE + 0x72000)
#define I2C_BASE3 (OMAP44XX_L4_PER_BASE + 0x6)
+#define I2C_BASE4 (OMAP44XX_L4_PER_BASE + 0x35)
/* MUSB base */
#define MUSB_BASE (OMAP44XX_L4_CORE_BASE + 0xAB000)
diff --git a/arch/arm/include/asm/arch-omap4/i2c.h
b/arch/arm/include/asm/arch-omap4/i2c.h
index a91b4c2..02ee2f8 100644
--- a/arch/arm/include/asm/arch-omap4/i2c.h
+++ b/arch/arm/include/asm/arch-omap4/i2c.h
@@ -23,7 +23,7 @@
#ifndef _OMAP4_I2C_H_
#define _OMAP4_I2C_H_
-#define I2C_BUS_MAX3
+#define I2C_BUS_MAX4
#define I2C_DEFAULT_BASE I2C_BASE1
struct i2c {
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 81193b0..df8ab92 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -448,6 +448,14 @@ int i2c_set_bus_num(unsigned int bus)
return -1;
}
+#if I2C_BUS_MAX == 4
+ if (bus == 3)
+ i2c_base = (struct i2c *)I2C_BASE4;
+ else
+ if (bus == 2)
+ i2c_base = (struct i2c *)I2C_BASE3;
+ else
+#endif
#if I2C_BUS_MAX == 3
if (bus == 2)
i2c_base = (struct i2c *)I2C_BASE3;
--
1.7.7.6
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] BeagleBoard: config: Really switch to ttyO2
The previous commit changed it to "zero two" instead of the proper "Oh two". This was completely broken! Signed-off-by: Koen Kooi --- include/configs/omap3_beagle.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 15e40c5..4dd37ae 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -215,7 +215,7 @@ "rdaddr=0x8100\0" \ "usbtty=cdc_acm\0" \ "bootfile=uImage.beagle\0" \ - "console=tty02,115200n8\0" \ + "console=ttyO2,115200n8\0" \ "mpurate=auto\0" \ "buddy=none "\ "optargs=\0" \ -- 1.7.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
