Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
U
uboot-imx
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Librem5
uboot-imx
Commits
950309c6
Commit
950309c6
authored
Jan 10, 2009
by
Wolfgang Denk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.denx.de/u-boot-blackfin
parents
3dd9395a
032a1c93
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
93 additions
and
61 deletions
+93
-61
board/bf533-ezkit/Makefile
board/bf533-ezkit/Makefile
+3
-4
board/bf533-ezkit/config.mk
board/bf533-ezkit/config.mk
+8
-0
board/bf533-ezkit/u-boot.lds.S
board/bf533-ezkit/u-boot.lds.S
+13
-10
board/bf533-stamp/Makefile
board/bf533-stamp/Makefile
+3
-4
board/bf533-stamp/config.mk
board/bf533-stamp/config.mk
+8
-0
board/bf533-stamp/u-boot.lds.S
board/bf533-stamp/u-boot.lds.S
+11
-8
board/bf537-stamp/Makefile
board/bf537-stamp/Makefile
+3
-4
board/bf537-stamp/config.mk
board/bf537-stamp/config.mk
+6
-1
board/bf537-stamp/nand.c
board/bf537-stamp/nand.c
+3
-1
board/bf537-stamp/u-boot.lds.S
board/bf537-stamp/u-boot.lds.S
+11
-8
board/bf561-ezkit/Makefile
board/bf561-ezkit/Makefile
+3
-4
board/bf561-ezkit/config.mk
board/bf561-ezkit/config.mk
+8
-0
board/bf561-ezkit/u-boot.lds.S
board/bf561-ezkit/u-boot.lds.S
+13
-10
lib_blackfin/board.c
lib_blackfin/board.c
+0
-7
No files found.
board/bf533-ezkit/Makefile
View file @
950309c6
...
...
@@ -35,12 +35,11 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS
:=
$(
addprefix
$(obj)
,
$(COBJS)
)
SOBJS
:=
$(
addprefix
$(obj)
,
$(SOBJS)
)
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS) u-boot.lds
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS)
$(obj)
u-boot.lds
$(AR)
$(ARFLAGS)
$@
$(OBJS)
$(SOBJS)
u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
-Ubfin
$^
>
$@
.tmp
mv
-f
$@
.tmp
$@
$(obj)u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
$^
>
$@
clean
:
rm
-f
$(SOBJS)
$(OBJS)
...
...
board/bf533-ezkit/config.mk
View file @
950309c6
#
# Copyright (c) 2005-2008 Analog Device Inc.
#
# (C) Copyright 2001
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
...
...
@@ -23,3 +25,9 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
LDSCRIPT
=
$(obj)
board/
$(BOARDDIR)
/u-boot.lds
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA
:=
--bits
16
--dma
8
LDR_FLAGS
+=
$
(
LDR_FLAGS-
$(CONFIG_BFIN_BOOT_MODE)
)
board/bf533-ezkit/u-boot.lds.S
View file @
950309c6
...
...
@@ -28,6 +28,8 @@
#include <config.h>
#include <asm/blackfin.h>
#undef ALIGN
#undef ENTRY
#undef bfin
/*
If
we
don
't actually load anything into L1 data, this will avoid
*
a
syntax
error
.
If
we
do
actually
load
something
into
L1
data
,
...
...
@@ -50,11 +52,12 @@ MEMORY
l1_data
:
ORIGIN
=
L1_DATA_B_SRAM
,
LENGTH
=
L1_DATA_B_SRAM_SIZE
}
ENTRY
(
_start
)
SECTIONS
{
.
text
:
{
cpu
/
blackfin
/
start.o
(
.
text
)
cpu
/
blackfin
/
start.o
(
.
text
.
text
.
*
)
#ifdef ENV_IS_EMBEDDED
/
*
WARNING
-
the
following
is
hand
-
optimized
to
fit
within
...
...
@@ -63,20 +66,20 @@ SECTIONS
*
it
linked
after
the
configuration
sector
.
*/
cpu
/
blackfin
/
traps.o
(
.
text
)
cpu
/
blackfin
/
interrupt.o
(
.
text
)
cpu
/
blackfin
/
serial.o
(
.
text
)
common
/
dlmalloc.o
(
.
text
)
lib_generic
/
crc32.o
(
.
text
)
lib_generic
/
zlib.o
(
.
text
)
board
/
bf533
-
ezkit
/
bf533
-
ezkit.o
(
.
text
)
cpu
/
blackfin
/
traps.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
interrupt.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
serial.o
(
.
text
.
text
.
*
)
common
/
dlmalloc.o
(
.
text
.
text
.
*
)
lib_generic
/
crc32.o
(
.
text
.
text
.
*
)
lib_generic
/
zlib.o
(
.
text
.
text
.
*
)
board
/
bf533
-
ezkit
/
bf533
-
ezkit.o
(
.
text
.
text
.
*
)
.
=
DEFINED
(
env_offset
)
?
env_offset
:
.
;
common
/
env_embedded
.
o
(
.
text
)
common
/
env_embedded
.
o
(
.
text
.
text
.
*
)
#endif
__initcode_start
=
.
;
cpu
/
blackfin
/
initcode.o
(
.
text
)
cpu
/
blackfin
/
initcode.o
(
.
text
.
text
.
*
)
__initcode_end
=
.
;
*(.
text
.
text
.
*)
...
...
board/bf533-stamp/Makefile
View file @
950309c6
...
...
@@ -35,12 +35,11 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS
:=
$(
addprefix
$(obj)
,
$(COBJS)
)
SOBJS
:=
$(
addprefix
$(obj)
,
$(SOBJS)
)
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS) u-boot.lds
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS)
$(obj)
u-boot.lds
$(AR)
$(ARFLAGS)
$@
$(OBJS)
$(SOBJS)
u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
-Ubfin
$^
>
$@
.tmp
mv
-f
$@
.tmp
$@
$(obj)u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
$^
>
$@
clean
:
rm
-f
$(SOBJS)
$(OBJS)
...
...
board/bf533-stamp/config.mk
View file @
950309c6
#
# Copyright (c) 2005-2008 Analog Device Inc.
#
# (C) Copyright 2001
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
...
...
@@ -23,3 +25,9 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
LDSCRIPT
=
$(obj)
board/
$(BOARDDIR)
/u-boot.lds
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA
:=
--bits
16
--dma
8
LDR_FLAGS
+=
$
(
LDR_FLAGS-
$(CONFIG_BFIN_BOOT_MODE)
)
board/bf533-stamp/u-boot.lds.S
View file @
950309c6
...
...
@@ -28,6 +28,8 @@
#include <config.h>
#include <asm/blackfin.h>
#undef ALIGN
#undef ENTRY
#undef bfin
/*
If
we
don
't actually load anything into L1 data, this will avoid
*
a
syntax
error
.
If
we
do
actually
load
something
into
L1
data
,
...
...
@@ -50,11 +52,12 @@ MEMORY
l1_data
:
ORIGIN
=
L1_DATA_B_SRAM
,
LENGTH
=
L1_DATA_B_SRAM_SIZE
}
ENTRY
(
_start
)
SECTIONS
{
.
text
:
{
cpu
/
blackfin
/
start.o
(
.
text
)
cpu
/
blackfin
/
start.o
(
.
text
.
text
.
*
)
#ifdef ENV_IS_EMBEDDED
/
*
WARNING
-
the
following
is
hand
-
optimized
to
fit
within
...
...
@@ -63,18 +66,18 @@ SECTIONS
*
it
linked
after
the
configuration
sector
.
*/
cpu
/
blackfin
/
traps.o
(
.
text
)
cpu
/
blackfin
/
interrupt.o
(
.
text
)
cpu
/
blackfin
/
serial.o
(
.
text
)
common
/
dlmalloc.o
(
.
text
)
lib_generic
/
crc32.o
(
.
text
)
cpu
/
blackfin
/
traps.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
interrupt.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
serial.o
(
.
text
.
text
.
*
)
common
/
dlmalloc.o
(
.
text
.
text
.
*
)
lib_generic
/
crc32.o
(
.
text
.
text
.
*
)
.
=
DEFINED
(
env_offset
)
?
env_offset
:
.
;
common
/
env_embedded
.
o
(
.
text
)
common
/
env_embedded
.
o
(
.
text
.
text
.
*
)
#endif
__initcode_start
=
.
;
cpu
/
blackfin
/
initcode.o
(
.
text
)
cpu
/
blackfin
/
initcode.o
(
.
text
.
text
.
*
)
__initcode_end
=
.
;
*(.
text
.
text
.
*)
...
...
board/bf537-stamp/Makefile
View file @
950309c6
...
...
@@ -35,12 +35,11 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS
:=
$(
addprefix
$(obj)
,
$(COBJS)
)
SOBJS
:=
$(
addprefix
$(obj)
,
$(SOBJS)
)
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS) u-boot.lds
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS)
$(obj)
u-boot.lds
$(AR)
$(ARFLAGS)
$@
$(OBJS)
$(SOBJS)
u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
-Ubfin
$^
>
$@
.tmp
mv
-f
$@
.tmp
$@
$(obj)u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
$^
>
$@
clean
:
rm
-f
$(SOBJS)
$(OBJS)
...
...
board/bf537-stamp/config.mk
View file @
950309c6
#
# Copyright (c) 2005-2008 Analog Device Inc.
#
# (C) Copyright 2001
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
...
...
@@ -24,6 +26,9 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
LDSCRIPT
=
$(obj)
board/
$(BOARDDIR)
/u-boot.lds
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_UART
:=
--port
g
--gpio
6
LDR_FLAGS-BFIN_BOOT_PARA
:=
--bits
16
--dma
8
LDR_FLAGS-BFIN_BOOT_UART
:=
--port
g
--gpio
6
LDR_FLAGS
+=
$
(
LDR_FLAGS-
$(CONFIG_BFIN_BOOT_MODE)
)
board/bf537-stamp/nand.c
View file @
950309c6
...
...
@@ -87,7 +87,7 @@ int bfin_device_ready(struct mtd_info *mtd)
* Members with a "?" were not set in the merged testing-NAND branch,
* so they are not set here either.
*/
void
board_nand_init
(
struct
nand_chip
*
nand
)
int
board_nand_init
(
struct
nand_chip
*
nand
)
{
*
PORT
(
CONFIG_NAND_GPIO_PORT
,
_FER
)
&=
~
BFIN_NAND_READY
;
*
PORT
(
CONFIG_NAND_GPIO_PORT
,
IO_DIR
)
&=
~
BFIN_NAND_READY
;
...
...
@@ -97,5 +97,7 @@ void board_nand_init(struct nand_chip *nand)
nand
->
ecc
.
mode
=
NAND_ECC_SOFT
;
nand
->
dev_ready
=
bfin_device_ready
;
nand
->
chip_delay
=
30
;
return
0
;
}
#endif
board/bf537-stamp/u-boot.lds.S
View file @
950309c6
...
...
@@ -28,6 +28,8 @@
#include <config.h>
#include <asm/blackfin.h>
#undef ALIGN
#undef ENTRY
#undef bfin
/*
If
we
don
't actually load anything into L1 data, this will avoid
*
a
syntax
error
.
If
we
do
actually
load
something
into
L1
data
,
...
...
@@ -50,11 +52,12 @@ MEMORY
l1_data
:
ORIGIN
=
L1_DATA_B_SRAM
,
LENGTH
=
L1_DATA_B_SRAM_SIZE
}
ENTRY
(
_start
)
SECTIONS
{
.
text
:
{
cpu
/
blackfin
/
start.o
(
.
text
)
cpu
/
blackfin
/
start.o
(
.
text
.
text
.
*
)
#ifdef ENV_IS_EMBEDDED
/
*
WARNING
-
the
following
is
hand
-
optimized
to
fit
within
...
...
@@ -63,18 +66,18 @@ SECTIONS
*
it
linked
after
the
configuration
sector
.
*/
cpu
/
blackfin
/
traps.o
(
.
text
)
cpu
/
blackfin
/
interrupt.o
(
.
text
)
cpu
/
blackfin
/
serial.o
(
.
text
)
common
/
dlmalloc.o
(
.
text
)
lib_generic
/
crc32.o
(
.
text
)
cpu
/
blackfin
/
traps.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
interrupt.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
serial.o
(
.
text
.
text
.
*
)
common
/
dlmalloc.o
(
.
text
.
text
.
*
)
lib_generic
/
crc32.o
(
.
text
.
text
.
*
)
.
=
DEFINED
(
env_offset
)
?
env_offset
:
.
;
common
/
env_embedded
.
o
(
.
text
)
common
/
env_embedded
.
o
(
.
text
.
text
.
*
)
#endif
__initcode_start
=
.
;
cpu
/
blackfin
/
initcode.o
(
.
text
)
cpu
/
blackfin
/
initcode.o
(
.
text
.
text
.
*
)
__initcode_end
=
.
;
*(.
text
.
text
.
*)
...
...
board/bf561-ezkit/Makefile
View file @
950309c6
...
...
@@ -35,12 +35,11 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS
:=
$(
addprefix
$(obj)
,
$(COBJS)
)
SOBJS
:=
$(
addprefix
$(obj)
,
$(SOBJS)
)
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS) u-boot.lds
$(LIB)
:
$(obj).depend $(OBJS) $(SOBJS)
$(obj)
u-boot.lds
$(AR)
$(ARFLAGS)
$@
$(OBJS)
$(SOBJS)
u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
-Ubfin
$^
>
$@
.tmp
mv
-f
$@
.tmp
$@
$(obj)u-boot.lds
:
u-boot.lds.S
$(CPP)
$(CPPFLAGS)
-D__ASSEMBLY__
-P
$^
>
$@
clean
:
rm
-f
$(SOBJS)
$(OBJS)
...
...
board/bf561-ezkit/config.mk
View file @
950309c6
#
# Copyright (c) 2005-2008 Analog Device Inc.
#
# (C) Copyright 2001
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
...
...
@@ -23,3 +25,9 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
LDSCRIPT
=
$(obj)
board/
$(BOARDDIR)
/u-boot.lds
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA
:=
--bits
16
LDR_FLAGS
+=
$
(
LDR_FLAGS-
$(CONFIG_BFIN_BOOT_MODE)
)
board/bf561-ezkit/u-boot.lds.S
View file @
950309c6
...
...
@@ -28,6 +28,8 @@
#include <config.h>
#include <asm/blackfin.h>
#undef ALIGN
#undef ENTRY
#undef bfin
/*
If
we
don
't actually load anything into L1 data, this will avoid
*
a
syntax
error
.
If
we
do
actually
load
something
into
L1
data
,
...
...
@@ -50,11 +52,12 @@ MEMORY
l1_data
:
ORIGIN
=
L1_DATA_B_SRAM
,
LENGTH
=
L1_DATA_B_SRAM_SIZE
}
ENTRY
(
_start
)
SECTIONS
{
.
text
:
{
cpu
/
blackfin
/
start.o
(
.
text
)
cpu
/
blackfin
/
start.o
(
.
text
.
text
.
*
)
#ifdef ENV_IS_EMBEDDED
/
*
WARNING
-
the
following
is
hand
-
optimized
to
fit
within
...
...
@@ -63,20 +66,20 @@ SECTIONS
*
it
linked
after
the
configuration
sector
.
*/
cpu
/
blackfin
/
traps.o
(
.
text
)
cpu
/
blackfin
/
interrupt.o
(
.
text
)
cpu
/
blackfin
/
serial.o
(
.
text
)
common
/
dlmalloc.o
(
.
text
)
lib_generic
/
crc32.o
(
.
text
)
lib_generic
/
zlib.o
(
.
text
)
board
/
bf561
-
ezkit
/
bf561
-
ezkit.o
(
.
text
)
cpu
/
blackfin
/
traps.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
interrupt.o
(
.
text
.
text
.
*
)
cpu
/
blackfin
/
serial.o
(
.
text
.
text
.
*
)
common
/
dlmalloc.o
(
.
text
.
text
.
*
)
lib_generic
/
crc32.o
(
.
text
.
text
.
*
)
lib_generic
/
zlib.o
(
.
text
.
text
.
*
)
board
/
bf561
-
ezkit
/
bf561
-
ezkit.o
(
.
text
.
text
.
*
)
.
=
DEFINED
(
env_offset
)
?
env_offset
:
.
;
common
/
env_embedded
.
o
(
.
text
)
common
/
env_embedded
.
o
(
.
text
.
text
.
*
)
#endif
__initcode_start
=
.
;
cpu
/
blackfin
/
initcode.o
(
.
text
)
cpu
/
blackfin
/
initcode.o
(
.
text
.
text
.
*
)
__initcode_end
=
.
;
*(.
text
.
text
.
*)
...
...
lib_blackfin/board.c
View file @
950309c6
...
...
@@ -374,13 +374,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
mem_malloc_init
();
malloc_bin_reloc
();
#ifdef CONFIG_SPI
# if ! defined(CONFIG_ENV_IS_IN_EEPROM)
spi_init_f
();
# endif
spi_init_r
();
#endif
#ifdef CONFIG_CMD_NAND
puts
(
"NAND: "
);
nand_init
();
/* go init the NAND */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment