summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-09-13 14:56:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-09-13 14:56:05 +0200
commitdd534571bdabeea50e32399b7661b3204275e724 (patch)
treed1cb34ffde79a411c5054630b505afb4bd4906d4
parentebe2e918c2f8d9afb309f941f516eee3d41e6c3d (diff)
parentfaf2ec64e7442fda2e2330c0df047bcd902c5927 (diff)
downloadbarebox-dd534571bdabeea50e32399b7661b3204275e724.tar.gz
Merge branch 'for-next/misc'
-rw-r--r--arch/arm/Makefile4
-rw-r--r--commands/Kconfig2
-rw-r--r--commands/saveenv.c2
-rw-r--r--common/Kconfig3
-rw-r--r--defaultenv/defaultenv-1/bin/boot4
-rw-r--r--defaultenv/defaultenv-1/bin/init5
-rw-r--r--drivers/mci/mmci.c3
-rw-r--r--drivers/mfd/mc13xxx.c1
-rw-r--r--drivers/net/phy/phy.c2
-rw-r--r--include/mfd/mc13xxx.h13
-rw-r--r--lib/string.c2
11 files changed, 21 insertions, 20 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 55f7248..96ec588 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -314,9 +314,5 @@ endif
common- += $(patsubst %,arch/arm/boards/%/,$(board-))
CLEAN_FILES += include/generated/mach-types.h barebox-flash-image
-
-ifeq ($(CONFIG_CPU_V8), y)
CLEAN_FILES += arch/arm/lib64/barebox.lds
-else
CLEAN_FILES += arch/arm/lib32/barebox.lds
-endif
diff --git a/commands/Kconfig b/commands/Kconfig
index decd45d..3c79831 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -2058,7 +2058,7 @@ config CMD_OF_FIXUP_STATUS
help
Register a fixup to enable or disable node
- Usage: of_fixup_node [-d] path
+ Usage: of_fixup_status [-d] path
Options:
-d disable node
diff --git a/commands/saveenv.c b/commands/saveenv.c
index 6f210b7..bc1202f 100644
--- a/commands/saveenv.c
+++ b/commands/saveenv.c
@@ -35,6 +35,8 @@ static int do_saveenv(int argc, char *argv[])
case 'z':
envfs_flags |= ENVFS_FLAGS_FORCE_BUILT_IN;
break;
+ default:
+ return COMMAND_ERROR_USAGE;
}
}
diff --git a/common/Kconfig b/common/Kconfig
index f4696d5..5bd50cb 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -471,7 +471,7 @@ config MENU
select PROCESS_ESCAPE_SEQUENCE
help
a menu framework that allow us to create list menu to simplify
- barebox and make it more user-frendly
+ barebox and make it more user-friendly
config PASSWORD
bool
@@ -844,6 +844,7 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW
select CMD_BASENAME
select CMD_READLINK
select CMD_DIRNAME
+ select CMD_TEST
select NVVAR
select CMD_NV
select FLEXIBLE_BOOTARGS
diff --git a/defaultenv/defaultenv-1/bin/boot b/defaultenv/defaultenv-1/bin/boot
index c17ccdb..a5d6596 100644
--- a/defaultenv/defaultenv-1/bin/boot
+++ b/defaultenv/defaultenv-1/bin/boot
@@ -2,6 +2,10 @@
. /env/config
+if [ -f /env/bin/boot_board ]; then
+ . /env/bin/boot_board
+fi
+
if [ x$kernel_loc = xnet ]; then
kernel_loc=tftp
fi
diff --git a/defaultenv/defaultenv-1/bin/init b/defaultenv/defaultenv-1/bin/init
index a55d293..2dcddbe 100644
--- a/defaultenv/defaultenv-1/bin/init
+++ b/defaultenv/defaultenv-1/bin/init
@@ -23,9 +23,8 @@ if [ -f /env/bin/init_board ]; then
fi
echo -e "\e[?25h"
-if [ -f /env/bin/boot_board ]; then
- . /env/bin/boot_board
-elif [ -n $autoboot_timeout ]; then
+
+if [ -n $autoboot_timeout ]; then
echo -n "Hit any key to stop autoboot: "
timeout -a $autoboot_timeout
if [ $? != 0 ]; then
diff --git a/drivers/mci/mmci.c b/drivers/mci/mmci.c
index 9d1e858..7489ee0 100644
--- a/drivers/mci/mmci.c
+++ b/drivers/mci/mmci.c
@@ -212,7 +212,7 @@ static u64 mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int host
struct variant_data *variant = host->variant;
do {
- int count = readl(base + MMCIFIFOCNT) << 2;
+ int count = host_remain - (readl(base + MMCIFIFOCNT) << 2);
if (count > host_remain)
count = host_remain;
@@ -264,7 +264,6 @@ static int read_bytes(struct mci_host *mci, char *dest, unsigned int blkcount, u
dev_dbg(host->hw_dev, "read_bytes: blkcount=%u blksize=%u\n", blkcount, blksize);
do {
- mmci_writel(host, MMCIDATACTRL, mmci_readl(host, MMCIDATACTRL));
len = mmci_pio_read(host, dest, xfercount);
xfercount -= len;
dest += len;
diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c
index b2fcd95..f6aa922 100644
--- a/drivers/mfd/mc13xxx.c
+++ b/drivers/mfd/mc13xxx.c
@@ -219,6 +219,7 @@ static struct __init {
{ 0x0a, MC13892_REVISION_1_2, "1.2" },
{ 0x10, MC13892_REVISION_2_0, "2.0" },
{ 0x11, MC13892_REVISION_2_1, "2.1" },
+ { 0x14, MC13892_REVISION_2_4, "2.4" },
{ 0x18, MC13892_REVISION_3_0, "3.0" },
{ 0x19, MC13892_REVISION_3_1, "3.1" },
{ 0x1a, MC13892_REVISION_3_2, "3.2" },
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 13b8324..7132516 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -311,8 +311,6 @@ static struct phy_device *of_phy_register_fixed_link(struct device_node *np,
phydev->registered = 1;
phydev->speed = 1000;
phydev->duplex = 1;
- phydev->pause = phydev->asym_pause = 0;
- phydev->link = 1;
return phydev;
}
diff --git a/include/mfd/mc13xxx.h b/include/mfd/mc13xxx.h
index 96a32e4..d351c47 100644
--- a/include/mfd/mc13xxx.h
+++ b/include/mfd/mc13xxx.h
@@ -127,12 +127,13 @@
#define MC13892_REVISION_2_0 3
#define MC13892_REVISION_2_0a 4
#define MC13892_REVISION_2_1 5
-#define MC13892_REVISION_3_0 6
-#define MC13892_REVISION_3_1 7
-#define MC13892_REVISION_3_2 8
-#define MC13892_REVISION_3_2a 9
-#define MC13892_REVISION_3_3 10
-#define MC13892_REVISION_3_5 11
+#define MC13892_REVISION_2_4 6
+#define MC13892_REVISION_3_0 7
+#define MC13892_REVISION_3_1 8
+#define MC13892_REVISION_3_2 9
+#define MC13892_REVISION_3_2a 10
+#define MC13892_REVISION_3_3 11
+#define MC13892_REVISION_3_5 12
#define MC13783_SWX_VOLTAGE(x) ((x) & 0x3f)
#define MC13783_SWX_VOLTAGE_DVS(x) (((x) & 0x3f) << 6)
diff --git a/lib/string.c b/lib/string.c
index a3e9fd8..1d491c9 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -641,7 +641,7 @@ char *skip_spaces(const char *str)
}
/**
- * strim - Removes leading and trailing whitespace from @s.
+ * strim - Removes trailing whitespace from @s.
* @s: The string to be stripped.
*
* Note that the first trailing whitespace is replaced with a %NUL-terminator