mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-10 05:06:16 +09:00
Merge branch '2019-02-29-master-imports'
- Assorted BSP fixes - Kbuild fix
This commit is contained in:
commit
7869e647a6
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -10,6 +10,7 @@
|
||||||
*.bin
|
*.bin
|
||||||
*.cfgout
|
*.cfgout
|
||||||
*.dtb
|
*.dtb
|
||||||
|
*.dtbo
|
||||||
*.dtb.S
|
*.dtb.S
|
||||||
*.elf
|
*.elf
|
||||||
*.exe
|
*.exe
|
||||||
|
|
|
@ -33,7 +33,7 @@ static void pl310_background_op_all_ways(u32 *op_reg)
|
||||||
/* Invalidate all ways */
|
/* Invalidate all ways */
|
||||||
writel(way_mask, op_reg);
|
writel(way_mask, op_reg);
|
||||||
/* Wait for all ways to be invalidated */
|
/* Wait for all ways to be invalidated */
|
||||||
while (readl(op_reg) && way_mask)
|
while (readl(op_reg) & way_mask)
|
||||||
;
|
;
|
||||||
pl310_cache_sync();
|
pl310_cache_sync();
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,11 +8,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <i2c.h>
|
||||||
#include <asm/arch/sys_proto.h>
|
#include <asm/arch/sys_proto.h>
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <asm/arch/mux.h>
|
#include <asm/arch/mux.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <i2c.h>
|
|
||||||
#include "board.h"
|
#include "board.h"
|
||||||
|
|
||||||
static struct module_pin_mux uart0_pin_mux[] = {
|
static struct module_pin_mux uart0_pin_mux[] = {
|
||||||
|
|
|
@ -728,6 +728,8 @@ ulong spl_relocate_stack_gd(void)
|
||||||
|
|
||||||
#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_VAL(SYS_MALLOC_F_LEN)
|
#if defined(CONFIG_SPL_SYS_MALLOC_SIMPLE) && CONFIG_VAL(SYS_MALLOC_F_LEN)
|
||||||
if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) {
|
if (CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN) {
|
||||||
|
debug("SPL malloc() before relocation used 0x%lx bytes (%ld KB)\n",
|
||||||
|
gd->malloc_ptr, gd->malloc_ptr / 1024);
|
||||||
ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
ptr -= CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
||||||
gd->malloc_base = ptr;
|
gd->malloc_base = ptr;
|
||||||
gd->malloc_limit = CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
gd->malloc_limit = CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN;
|
||||||
|
|
|
@ -415,7 +415,7 @@ static void _omap3_spi_set_wordlen(struct omap3_spi_priv *priv)
|
||||||
unsigned int confr;
|
unsigned int confr;
|
||||||
|
|
||||||
/* McSPI individual channel configuration */
|
/* McSPI individual channel configuration */
|
||||||
confr = readl(&priv->regs->channel[priv->wordlen].chconf);
|
confr = readl(&priv->regs->channel[priv->cs].chconf);
|
||||||
|
|
||||||
/* wordlength */
|
/* wordlength */
|
||||||
confr &= ~OMAP3_MCSPI_CHCONF_WL_MASK;
|
confr &= ~OMAP3_MCSPI_CHCONF_WL_MASK;
|
||||||
|
|
|
@ -40,6 +40,7 @@ endif
|
||||||
echo >&2; \
|
echo >&2; \
|
||||||
/bin/false)
|
/bin/false)
|
||||||
|
|
||||||
|
PHONY += arch-dtbs
|
||||||
arch-dtbs:
|
arch-dtbs:
|
||||||
$(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
|
$(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
|
||||||
|
|
||||||
|
|
|
@ -696,11 +696,11 @@ static int
|
||||||
set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
|
set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
|
||||||
loff_t maxsize, loff_t *gotsize)
|
loff_t maxsize, loff_t *gotsize)
|
||||||
{
|
{
|
||||||
loff_t filesize;
|
|
||||||
unsigned int bytesperclust = mydata->clust_size * mydata->sect_size;
|
unsigned int bytesperclust = mydata->clust_size * mydata->sect_size;
|
||||||
__u32 curclust = START(dentptr);
|
__u32 curclust = START(dentptr);
|
||||||
__u32 endclust = 0, newclust = 0;
|
__u32 endclust = 0, newclust = 0;
|
||||||
loff_t cur_pos, offset, actsize, wsize;
|
u64 cur_pos, filesize;
|
||||||
|
loff_t offset, actsize, wsize;
|
||||||
|
|
||||||
*gotsize = 0;
|
*gotsize = 0;
|
||||||
filesize = pos + maxsize;
|
filesize = pos + maxsize;
|
||||||
|
@ -828,7 +828,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
|
||||||
|
|
||||||
curclust = endclust;
|
curclust = endclust;
|
||||||
filesize -= cur_pos;
|
filesize -= cur_pos;
|
||||||
assert(!(cur_pos % bytesperclust));
|
assert(!do_div(cur_pos, bytesperclust));
|
||||||
|
|
||||||
set_clusters:
|
set_clusters:
|
||||||
/* allocate and write */
|
/* allocate and write */
|
||||||
|
|
|
@ -301,7 +301,8 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
|
||||||
$(DTC) -O dtb -o $@ -b 0 \
|
$(DTC) -O dtb -o $@ -b 0 \
|
||||||
-i $(dir $<) $(DTC_FLAGS) \
|
-i $(dir $<) $(DTC_FLAGS) \
|
||||||
-d $(depfile).dtc.tmp $(dtc-tmp) ; \
|
-d $(depfile).dtc.tmp $(dtc-tmp) ; \
|
||||||
cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
|
cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) ; \
|
||||||
|
sed -i "s:$(pre-tmp):$(<):" $(depfile)
|
||||||
|
|
||||||
$(obj)/%.dtb: $(src)/%.dts FORCE
|
$(obj)/%.dtb: $(src)/%.dts FORCE
|
||||||
$(call if_changed_dep,dtc)
|
$(call if_changed_dep,dtc)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user