sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/misc'

This commit is contained in:
Sascha Hauer 2015-10-07 08:23:45 +02:00
parent 7bf2e891a4 1c9e671462
commit c8fa7eed66
17 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/ls.c
View File

@ -32,7 +32,7 @@ static void ls_one(const char *path, const char* fullname, struct stat *s)
unsigned int namelen = strlen(path);
mkmodestr(s->st_mode, modestr);
printf("%s %10llu %*.*s", modestr, s->st_size, namelen, namelen, path);
printf("%s %14llu %*.*s", modestr, s->st_size, namelen, namelen, path);
if (S_ISLNK(s->st_mode)) {
char realname[PATH_MAX];

7
commands/ubiformat.c
View File

@ -297,7 +297,7 @@ static int mark_bad(const struct mtd_dev_info *mtd, struct ubi_scan_info *si, in
static int flash_image(const struct mtd_dev_info *mtd,
const struct ubigen_info *ui, struct ubi_scan_info *si)
{
int fd, img_ebs, eb, written_ebs = 0, divisor, ret = -1;
int fd, img_ebs, eb, written_ebs = 0, ret = -1;
off_t st_size;
char *buf = NULL;
@ -332,7 +332,6 @@ static int flash_image(const struct mtd_dev_info *mtd,
}
verbose(args.verbose, "will write %d eraseblocks", img_ebs);
divisor = img_ebs;
for (eb = 0; eb < mtd->eb_cnt; eb++) {
int err, new_len;
long long ec;
@ -342,10 +341,8 @@ static int flash_image(const struct mtd_dev_info *mtd,
eb, (eb + 1) * 100 / mtd->eb_cnt);
}
if (si->ec[eb] == EB_BAD) {
divisor += 1;
if (si->ec[eb] == EB_BAD)
continue;
}
if (args.verbose) {
normsg_cont("eraseblock %d: erase", eb);

2
common/blspec.c
View File

@ -646,7 +646,7 @@ static int blspec_append_root(struct blspec_entry *entry)
rootarg = path_get_linux_rootarg(entry->rootpath);
if (IS_ERR(rootarg)) {
pr_err("Getting root argument for %s failed with: %s\n",
entry->rootpath, strerror(-PTR_ERR(rootarg)));
entry->rootpath, strerrorp(rootarg));
return PTR_ERR(rootarg);
}

6
common/console_common.c
View File

@ -105,7 +105,7 @@ nolog:
int pr_print(int level, const char *fmt, ...)
{
va_list args;
uint i;
int i;
char printbuffer[CFG_PBSIZE];
if (!IS_ENABLED(CONFIG_LOGBUF) && level > barebox_loglevel)
@ -191,7 +191,7 @@ void log_print(unsigned flags)
int printf(const char *fmt, ...)
{
va_list args;
uint i;
int i;
char printbuffer[CFG_PBSIZE];
va_start(args, fmt);
@ -212,7 +212,7 @@ EXPORT_SYMBOL(printf);
int vprintf(const char *fmt, va_list args)
{
uint i;
int i;
char printbuffer[CFG_PBSIZE];
/*

1
drivers/mtd/spi-nor/spi-nor.c
View File

@ -541,6 +541,7 @@ static const struct spi_device_id spi_nor_ids[] = {
{ "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K) },
{ "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
{ "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, 0) },
{ "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K) },
/* SST -- large erase sizes are "overlays", "sectors" are 4K */
{ "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) },

2
drivers/usb/imx/imx-usb-phy.c
View File

@ -78,7 +78,7 @@ static int imx_usbphy_probe(struct device_d *dev)
imxphy->clk = clk_get(dev, NULL);
if (IS_ERR(imxphy->clk)) {
dev_err(dev, "could not get clk: %s\n", strerror(-PTR_ERR(imxphy->clk)));
dev_err(dev, "could not get clk: %s\n", strerrorp(imxphy->clk));
goto err_clk;
}

2
drivers/usb/storage/transport.c
View File

@ -54,7 +54,7 @@ static const unsigned char us_direction[256/8] = {
*/
/* Clear a stall on an endpoint - special for bulk-only devices */
int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe)
static int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe)
{
return usb_clear_halt(us->pusb_dev, pipe);
}

3
drivers/video/Kconfig
View File

@ -13,6 +13,7 @@ config FRAMEBUFFER_CONSOLE
prompt "framebuffer console support"
config VIDEO_VPL
depends on OFTREE
bool
config DRIVER_VIDEO_ATMEL
@ -121,6 +122,7 @@ config DRIVER_VIDEO_MTL017
bool "MTL017 LVDS encoder"
select VIDEO_VPL
depends on I2C
depends on OFTREE
help
The MTL017 is a parallel to lvds video encoder chip found on the
Efika MX Smartbook.
@ -128,6 +130,7 @@ config DRIVER_VIDEO_MTL017
config DRIVER_VIDEO_SIMPLE_PANEL
bool "Simple panel support"
select VIDEO_VPL
depends on OFTREE
help
This enabled support for simple panels, i.e. panels which consist of
a mode definition and enable gpios in the devicetree. Unlike the

1
drivers/video/imx-ipu-v3/Kconfig
View File

@ -13,6 +13,7 @@ config DRIVER_VIDEO_IMX_IPUV3_LVDS
config DRIVER_VIDEO_IMX_IPUV3_HDMI
bool "IPUv3 HDMI support"
depends on DRIVER_VIDEO_EDID
select OFDEVICE
endif

1
drivers/video/imx-ipu-v3/imx-hdmi.c
View File

@ -132,7 +132,6 @@ struct dw_hdmi {
bool phy_enabled;
struct regmap *regmap;
struct device_node *ddc_node;;
void __iomem *regs;

8
drivers/video/imx-ipu-v3/imx-ldb.c
View File

@ -163,7 +163,7 @@ static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di)
diclk = clk_lookup(clkname);
free(clkname);
if (IS_ERR(diclk)) {
dev_err(ldb->dev, "failed to get di clk: %s\n", strerror(PTR_ERR(diclk)));
dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk));
return PTR_ERR(diclk);
}
@ -171,7 +171,7 @@ static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di)
ldbclk = clk_lookup(clkname);
free(clkname);
if (IS_ERR(ldbclk)) {
dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerror(PTR_ERR(ldbclk)));
dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk));
return PTR_ERR(ldbclk);
}
@ -203,7 +203,7 @@ static int imx53_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di)
diclk = clk_lookup(clkname);
free(clkname);
if (IS_ERR(diclk)) {
dev_err(ldb->dev, "failed to get di clk: %s\n", strerror(PTR_ERR(diclk)));
dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk));
return PTR_ERR(diclk);
}
@ -211,7 +211,7 @@ static int imx53_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di)
ldbclk = clk_lookup(clkname);
free(clkname);
if (IS_ERR(ldbclk)) {
dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerror(PTR_ERR(ldbclk)));
dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk));
return PTR_ERR(ldbclk);
}

2
fs/ramfs.c
View File

@ -495,7 +495,7 @@ static int ramfs_truncate(struct device_d *dev, FILE *f, ulong size)
data->next = ramfs_get_chunk();
if (!data->next)
return -ENOMEM;
data = data->next;
data = data->next;
}
}
node->size = size;

2
fs/ubifs/ubifs.c
View File

@ -622,7 +622,7 @@ static int ubifs_probe(struct device_d *dev)
priv->ubi = ubi_open_volume_cdev(priv->cdev, UBI_READONLY);
if (IS_ERR(priv->ubi)) {
dev_err(dev, "failed to open ubi volume: %s\n",
strerror(-PTR_ERR(priv->ubi)));
strerrorp(priv->ubi));
ret = PTR_ERR(priv->ubi);
goto err_free;
}

3
include/clock.h
View File

@ -34,9 +34,8 @@ uint32_t clocksource_hz2mult(uint32_t hz, uint32_t shift_constant);
int is_timeout(uint64_t start_ns, uint64_t time_offset_ns);
int is_timeout_non_interruptible(uint64_t start_ns, uint64_t time_offset_ns);
// void udelay(unsigned long usecs);
void ndelay(unsigned long nsecs);
void udelay(unsigned long usecs);
void mdelay(unsigned long msecs);
#define SECOND ((uint64_t)(1000 * 1000 * 1000))

5
include/common.h
View File

@ -23,6 +23,7 @@
#include <stdio.h>
#include <module.h>
#include <config.h>
#include <clock.h>
#include <linux/bitops.h>
#include <linux/types.h>
#include <linux/string.h>
@ -69,10 +70,6 @@ long get_ram_size (volatile long *, long);
/* $(CPU)/cpu.c */
void __noreturn poweroff(void);
/* lib_$(ARCH)/time.c */
void udelay (unsigned long);
void mdelay (unsigned long);
/* lib_generic/crc32.c */
uint32_t crc32(uint32_t, const void*, unsigned int);
uint32_t crc32_no_comp(uint32_t, const void*, unsigned int);

6
include/errno.h
View File

@ -2,6 +2,7 @@
#define __ERRNO_H
#include <asm-generic/errno.h>
#include <linux/err.h>
extern int errno;
@ -9,4 +10,9 @@ void perror(const char *s);
const char *errno_str(void);
const char *strerror(int errnum);
static inline const char *strerrorp(const void *errp)
{
return strerror(-PTR_ERR(errp));
}
#endif /* __ERRNO_H */

4
lib/logo/Kconfig
View File

@ -5,6 +5,8 @@ menuconfig BAREBOX_LOGO
dependencies. The logo can be found under /logo/barebox-logo-<width>.png
in the running barebox.
if BAREBOX_LOGO
config BAREBOX_LOGO_64
bool "include 64x32 pixel logo"
@ -19,3 +21,5 @@ config BAREBOX_LOGO_400
config BAREBOX_LOGO_640
bool "include 640x320 pixel logo"
endif # BAREBOX_LOGO