Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
U
u-boot-stm32
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sami Nurmenniemi
u-boot-stm32
Commits
af02924d
Commit
af02924d
authored
May 26, 2017
by
Sergei Poselenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RM 1286. Support 64MB SDRAM on STM32f7-SOM as stm32f7-som-64_config
and stm32f7-som-64-ext-bsb_config.
parent
c808f9f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
Makefile
Makefile
+7
-0
board/emcraft/stm32f7-som/board.c
board/emcraft/stm32f7-som/board.c
+5
-0
cpu/arm_cortexm3/stm32/soc.c
cpu/arm_cortexm3/stm32/soc.c
+2
-2
include/configs/stm32f7-som.h
include/configs/stm32f7-som.h
+2
-0
No files found.
Makefile
View file @
af02924d
...
@@ -3246,6 +3246,8 @@ stm-som-1a_config : unconfig
...
@@ -3246,6 +3246,8 @@ stm-som-1a_config : unconfig
}
}
@$(MKCONFIG)
-a
stm-som
arm
arm_cortexm3
stm-som
emcraft
stm32
@$(MKCONFIG)
-a
stm-som
arm
arm_cortexm3
stm-som
emcraft
stm32
stm32f7-som-64_config
\
stm32f7-som-64-ext-bsb_config
\
stm32f7-som_config
\
stm32f7-som_config
\
stm32f7-som-ext-bsb_config
:
unconfig
stm32f7-som-ext-bsb_config
:
unconfig
@
if
[
"
$(
findstring
ext-bsb,
$@
)
"
]
;
then
\
@
if
[
"
$(
findstring
ext-bsb,
$@
)
"
]
;
then
\
...
@@ -3254,6 +3256,11 @@ stm32f7-som-ext-bsb_config: unconfig
...
@@ -3254,6 +3256,11 @@ stm32f7-som-ext-bsb_config: unconfig
echo
"#define CONFIG_SYS_BOARD_UCL_BSB"
>>
$(obj)
include/config.h
;
\
echo
"#define CONFIG_SYS_BOARD_UCL_BSB"
>>
$(obj)
include/config.h
;
\
echo
"...for UCL-BSB"
;
\
echo
"...for UCL-BSB"
;
\
fi
;
fi
;
@
if
[
"
$(
findstring
64,
$@
)
"
]
;
then
\
echo
"...for 64MB SDRAM variant"
;
\
echo
"#define CONFIG_SYS_RAM_SIZE (64 * 1024 * 1024)"
>>
\
$(obj)
include/config.h
;
\
fi
;
@
$(MKCONFIG)
-a
stm32f7-som arm arm_cortexm3 stm32f7-som emcraft stm32
@
$(MKCONFIG)
-a
stm32f7-som arm arm_cortexm3 stm32f7-som emcraft stm32
stm32f429-discovery_config
:
unconfig
stm32f429-discovery_config
:
unconfig
...
...
board/emcraft/stm32f7-som/board.c
View file @
af02924d
...
@@ -580,7 +580,12 @@ static inline u32 _ns2clk(u32 ns, u32 freq)
...
@@ -580,7 +580,12 @@ static inline u32 _ns2clk(u32 ns, u32 freq)
#define SDRAM_MWID 1
/* 16 bit memory */
#define SDRAM_MWID 1
/* 16 bit memory */
#define SDRAM_NR 0x2
/* 13-bit row */
#define SDRAM_NR 0x2
/* 13-bit row */
#if (CONFIG_SYS_RAM_SIZE == (32 * 1024 * 1024))
#define SDRAM_NC 0x1
/* 9-bit col */
#define SDRAM_NC 0x1
/* 9-bit col */
#endif
#if (CONFIG_SYS_RAM_SIZE == (64 * 1024 * 1024))
#define SDRAM_NC 0x2
/* 10-bit col */
#endif
#define SDRAM_TRRD NS2CLK(12)
#define SDRAM_TRRD NS2CLK(12)
#define SDRAM_TRCD NS2CLK(18)
#define SDRAM_TRCD NS2CLK(18)
...
...
cpu/arm_cortexm3/stm32/soc.c
View file @
af02924d
...
@@ -180,7 +180,7 @@ static void stm32f7_mpu_config(void)
...
@@ -180,7 +180,7 @@ static void stm32f7_mpu_config(void)
0
<<
8
|
31
<<
1
|
1
<<
0
);
0
<<
8
|
31
<<
1
|
1
<<
0
);
/*
/*
* Configure
32
MB SDRAM region as Normal memory with the appropriate
* Configure
64
MB SDRAM region as Normal memory with the appropriate
* cacheability attributes
* cacheability attributes
*/
*/
cortex_m3_mpu_set_region
(
MPU_RGN_SDRAM_CA
,
cortex_m3_mpu_set_region
(
MPU_RGN_SDRAM_CA
,
...
@@ -193,7 +193,7 @@ static void stm32f7_mpu_config(void)
...
@@ -193,7 +193,7 @@ static void stm32f7_mpu_config(void)
/* Non-cacheable */
/* Non-cacheable */
1
<<
19
|
0
<<
18
|
0
<<
17
|
0
<<
16
|
1
<<
19
|
0
<<
18
|
0
<<
17
|
0
<<
16
|
#endif
#endif
0
<<
8
|
2
4
<<
1
|
1
<<
0
);
0
<<
8
|
2
5
<<
1
|
1
<<
0
);
#if defined(CONFIG_STM32F7_DCACHE_ON) || defined(CONFIG_STM32F7_ICACHE_ON)
#if defined(CONFIG_STM32F7_DCACHE_ON) || defined(CONFIG_STM32F7_ICACHE_ON)
stm32f7_envm_mpu_cfg
(
0
,
0
);
stm32f7_envm_mpu_cfg
(
0
,
0
);
...
...
include/configs/stm32f7-som.h
View file @
af02924d
...
@@ -160,7 +160,9 @@
...
@@ -160,7 +160,9 @@
* Configuration of the external SDRAM memory
* Configuration of the external SDRAM memory
*/
*/
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_NR_DRAM_BANKS 1
#ifndef CONFIG_SYS_RAM_SIZE
#define CONFIG_SYS_RAM_SIZE (32 * 1024 * 1024)
#define CONFIG_SYS_RAM_SIZE (32 * 1024 * 1024)
#endif
#define CONFIG_SYS_RAM_FREQ_DIV 2
#define CONFIG_SYS_RAM_FREQ_DIV 2
#define CONFIG_SYS_RAM_BASE 0xC0000000
#define CONFIG_SYS_RAM_BASE 0xC0000000
...
...
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