Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit 439f438

Browse files
committed
Update to GCC 6-2017-q1-update
Other changes include: * Now produce BuildShellDevelop as well to set GCC4MBED_TYPE to produce development profile builds with optimizations and asserts both enabled. Release builds are optimized too but asserts are disabled. * Got rid of the makefile in the root of the project and now perform a test build from the install scripts using the samples/Makefile instead.
1 parent 2cc08f4 commit 439f438

File tree

7 files changed

+52
-67
lines changed

7 files changed

+52
-67
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ deploy
1313
debug
1414
/BuildShell
1515
/BuildShellDebug
16+
/BuildShellDevelop
1617
/BuildShell.cmd
1718
/BuildShellDebug.cmd
19+
/BuildShellDevelop.cmd
1820
/gcc-arm-none-eabi/
1921
/mac_install.log
2022
/win_install.log

README.creole

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
==Current Version
2-
**GCC Version:** [[https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major | GCC ARM Embedded 5-2015-q4-major]]\\
2+
**GCC Version:** [[https://launchpad.net/gcc-arm-embedded/6.0/6-2017-q1-update | GCC ARM Embedded 6-2017-q1-update]]\\
33
**mbed SDK Version:** [[https://github.com/mbedmicro/mbed/releases/tag/mbed_lib_rev141 | Revision 141]]\\
44

55
==Previous Versions

external/osx64/arm-none-eabi-gdb

1.44 MB
Binary file not shown.

linux_install

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env bash
2-
# Copyright 2016 Adam Green (http://mbed.org/users/AdamGreen/)
2+
# Copyright 2017 Adam Green (http://mbed.org/users/AdamGreen/)
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -37,17 +37,18 @@ pushd $ROOTDIR
3737
ROOTDIR=$PWD
3838
LOGFILE=$ROOTDIR/linux_install.log
3939
ERRORFILE=$ROOTDIR/linux_install.err
40-
GCC4ARM_VERSION=gcc-arm-none-eabi-5_2-2015q4
41-
GCC4ARM_FILENAME=gcc-arm-none-eabi-5_2-2015q4-20151219-linux.tar.bz2
42-
GCC4ARM_URL=https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/$GCC4ARM_FILENAME
40+
GCC4ARM_VERSION=gcc-arm-none-eabi-6-2017-q1-update
41+
GCC4ARM_FILENAME=gcc-arm-none-eabi-6-2017-q1-update-linux.tar.bz2
42+
GCC4ARM_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6_1-2017q1/$GCC4ARM_FILENAME
4343
GCC4ARM_TAR=$ROOTDIR/$GCC4ARM_FILENAME
44-
GCC4ARM_MD5=f88caac80b4444a17344f57ccb760b90
44+
GCC4ARM_MD5=30004c24f4632bc594952462bb0cd1c9
4545
GCC4ARM_EXTRACT=$ROOTDIR/$GCC4ARM_VERSION
4646
GCC4ARM_DIR=$ROOTDIR/gcc-arm-none-eabi
4747
GCC4ARM_BINDIR=$GCC4ARM_DIR/bin
4848
OUR_MAKE=make
4949
BUILDSHELL_CMD=$ROOTDIR/BuildShell
5050
BUILDSHELL_DEBUG_CMD=$ROOTDIR/BuildShellDebug
51+
BUILDSHELL_DEVELOP_CMD=$ROOTDIR/BuildShellDevelop
5152

5253

5354
echo Logging install results to $LOGFILE
@@ -102,12 +103,24 @@ echo "export GCC4MBED_TYPE=Debug">>$BUILDSHELL_DEBUG_CMD
102103
echo "exec bash">>$BUILDSHELL_DEBUG_CMD
103104
chmod +x $BUILDSHELL_DEBUG_CMD
104105

106+
echo "#! /usr/bin/env bash">$BUILDSHELL_DEVELOP_CMD
107+
echo "# Modify next line and set destination drive to match mbed device">>$BUILDSHELL_DEVELOP_CMD
108+
echo "export GCC4MBED_DEPLOY='cp PROJECT.bin /media/MBED/ ; sync'">>$BUILDSHELL_DEVELOP_CMD
109+
echo>>$BUILDSHELL_DEVELOP_CMD
110+
echo "SCRIPT_PATH=\$0">>$BUILDSHELL_DEVELOP_CMD
111+
echo "SCRIPT_PATH=\${SCRIPT_PATH%/*}">>$BUILDSHELL_DEVELOP_CMD
112+
echo "cd \$SCRIPT_PATH">>$BUILDSHELL_DEVELOP_CMD
113+
echo "SCRIPT_PATH=\$PWD">>$BUILDSHELL_DEVELOP_CMD
114+
echo "export PATH=\$SCRIPT_PATH/gcc-arm-none-eabi/bin:\$PATH">>$BUILDSHELL_DEVELOP_CMD
115+
echo "export GCC4MBED_TYPE=Develop">>$BUILDSHELL_DEVELOP_CMD
116+
echo "exec bash">>$BUILDSHELL_DEVELOP_CMD
117+
chmod +x $BUILDSHELL_DEVELOP_CMD
118+
105119
# Place arm-none-eabi-* tools in the path before building gcc4mbed code.
106120
PATH=$GCC4ARM_BINDIR:$PATH
107121

108122
echo Performing a clean build of the gcc4mbed samples...
109-
RunAndLog $OUR_MAKE clean
110-
RunAndLog $OUR_MAKE
123+
RunAndLog $OUR_MAKE -C samples/ clean-all LPC1768
111124

112125
echo Cleaning up intermediate files...
113126
RunAndLog rm $GCC4ARM_TAR

mac_install

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env bash
2-
# Copyright 2016 Adam Green (http://mbed.org/users/AdamGreen/)
2+
# Copyright 2017 Adam Green (http://mbed.org/users/AdamGreen/)
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -37,18 +37,19 @@ pushd $ROOTDIR
3737
ROOTDIR=$PWD
3838
LOGFILE=$ROOTDIR/mac_install.log
3939
ERRORFILE=$ROOTDIR/mac_install.err
40-
GCC4ARM_VERSION=gcc-arm-none-eabi-5_2-2015q4
41-
GCC4ARM_FILENAME=gcc-arm-none-eabi-5_2-2015q4-20151219-mac.tar.bz2
42-
GCC4ARM_URL=https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/$GCC4ARM_FILENAME
40+
GCC4ARM_VERSION=gcc-arm-none-eabi-6-2017-q1-update
41+
GCC4ARM_FILENAME=gcc-arm-none-eabi-6-2017-q1-update-mac.tar.bz2
42+
GCC4ARM_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6_1-2017q1/$GCC4ARM_FILENAME
4343
GCC4ARM_TAR=$ROOTDIR/$GCC4ARM_FILENAME
44-
GCC4ARM_MD5=603bcce8e59683ac27054b3197a53254
44+
GCC4ARM_MD5=709c86af4c92d17bd5fb9dcfe00ffd6d
4545
GCC4ARM_EXTRACT=$ROOTDIR/$GCC4ARM_VERSION
4646
GCC4ARM_DIR=$ROOTDIR/gcc-arm-none-eabi
4747
GCC4ARM_BINDIR=$GCC4ARM_DIR/bin
4848
MACBIN_DIR=$ROOTDIR/external/osx64
4949
OUR_MAKE=$ROOTDIR/external/osx64/make
5050
BUILDSHELL_CMD=$ROOTDIR/BuildShell
5151
BUILDSHELL_DEBUG_CMD=$ROOTDIR/BuildShellDebug
52+
BUILDSHELL_DEVELOP_CMD=$ROOTDIR/BuildShellDevelop
5253

5354

5455
echo Logging install results to $LOGFILE
@@ -105,12 +106,24 @@ echo "export GCC4MBED_TYPE=Debug">>$BUILDSHELL_DEBUG_CMD
105106
echo "exec bash">>$BUILDSHELL_DEBUG_CMD
106107
chmod +x $BUILDSHELL_DEBUG_CMD
107108

109+
echo "#! /usr/bin/env bash">$BUILDSHELL_DEVELOP_CMD
110+
echo "# Modify next line and set destination drive to match mbed device">>$BUILDSHELL_DEVELOP_CMD
111+
echo "export GCC4MBED_DEPLOY='cp PROJECT.bin /Volumes/MBED/'">>$BUILDSHELL_DEVELOP_CMD
112+
echo>>$BUILDSHELL_DEVELOP_CMD
113+
echo "SCRIPT_PATH=\$0">>$BUILDSHELL_DEVELOP_CMD
114+
echo "SCRIPT_PATH=\${SCRIPT_PATH%/*}">>$BUILDSHELL_DEVELOP_CMD
115+
echo "cd \$SCRIPT_PATH">>$BUILDSHELL_DEVELOP_CMD
116+
echo "SCRIPT_PATH=\$PWD">>$BUILDSHELL_DEVELOP_CMD
117+
echo "export PATH=\$SCRIPT_PATH/external/osx64:\$SCRIPT_PATH/gcc-arm-none-eabi/bin:\$PATH">>$BUILDSHELL_DEVELOP_CMD
118+
echo "export GCC4MBED_TYPE=Develop">>$BUILDSHELL_DEVELOP_CMD
119+
echo "exec bash">>$BUILDSHELL_DEVELOP_CMD
120+
chmod +x $BUILDSHELL_DEVELOP_CMD
121+
108122
# Place arm-none-eabi-* tools in the path before building gcc4mbed code.
109123
PATH=$GCC4ARM_BINDIR:$PATH
110124

111125
echo Performing a clean build of the gcc4mbed samples...
112-
RunAndLog $OUR_MAKE clean
113-
RunAndLog $OUR_MAKE
126+
RunAndLog $OUR_MAKE -C samples/ clean-all LPC1768
114127

115128
echo Cleaning up intermediate files...
116129
RunAndLog rm $GCC4ARM_TAR

makefile

Lines changed: 0 additions & 44 deletions
This file was deleted.

win_install.cmd

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
2-
rem Copyright 2016 Adam Green (http://mbed.org/users/AdamGreen/)
2+
rem Copyright 2017 Adam Green (http://mbed.org/users/AdamGreen/)
33
rem
44
rem Licensed under the Apache License, Version 2.0 (the "License");
55
rem you may not use this file except in compliance with the License.
@@ -19,18 +19,19 @@ setlocal
1919
set ROOTDIR=%~dp0
2020
set LOGFILE=%ROOTDIR%win_install.log
2121
set ERRORFILE=%ROOTDIR%win_install.err
22-
set GCC4ARM_VERSION=gcc-arm-none-eabi-5_2-2015q4
23-
set GCC4ARM_FILENAME=gcc-arm-none-eabi-5_2-2015q4-20151219-win32.zip
24-
set GCC4ARM_URL=https://launchpad.net/gcc-arm-embedded/5.0/5-2015-q4-major/+download/%GCC4ARM_FILENAME%
22+
set GCC4ARM_VERSION=gcc-arm-none-eabi-6-2017-q1-update
23+
set GCC4ARM_FILENAME=gcc-arm-none-eabi-6-2017-q1-update-win32.zip
24+
set GCC4ARM_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6_1-2017q1/%GCC4ARM_FILENAME%
2525
set GCC4ARM_TAR=%ROOTDIR%%GCC4ARM_FILENAME%
26-
set GCC4ARM_MD5=5b513d3453ecd5e2034eeb951a79607f
26+
set GCC4ARM_MD5=ec8b98945d4faf0c28a05bcdc1c2e537
2727
set GCC4ARM_MD5_FILENAME=%ROOTDIR%gcc-arm-none-eabi.md5
2828
set GCC4ARM_DIR=%ROOTDIR%gcc-arm-none-eabi
2929
set GCC4ARM_BINDIR=%GCC4ARM_DIR%\bin
3030
set OUR_MAKE=%ROOTDIR%external\win32\make.exe
3131
set BUILDENV_CMD=%GCC4ARM_BINDIR%\buildenv.cmd
3232
set BUILDSHELL_CMD=%ROOTDIR%BuildShell.cmd
3333
set BUILDSHELL_DEBUG_CMD=%ROOTDIR%BuildShellDebug.cmd
34+
set BUILDSHELL_DEVELOP_CMD=%ROOTDIR%BuildShellDevelop.cmd
3435

3536

3637
rem Make sure that we are running with current directory set to where this
@@ -71,14 +72,14 @@ rem
7172
echo @cmd.exe /K %%~dp0\gcc-arm-none-eabi\bin\buildenv.cmd>%BUILDSHELL_CMD%
7273
rem
7374
echo @cmd.exe /K "set GCC4MBED_TYPE=Debug& %%~dp0\gcc-arm-none-eabi\bin\buildenv.cmd">%BUILDSHELL_DEBUG_CMD%
75+
rem
76+
echo @cmd.exe /K "set GCC4MBED_TYPE=Develop& %%~dp0\gcc-arm-none-eabi\bin\buildenv.cmd">%BUILDSHELL_DEVELOP_CMD%
7477

7578
rem Place GNU Tool for ARM Embedded Processors in the path before building gcc4mbed code.
7679
set path=%GCC4ARM_BINDIR%;%ROOTDIR%external\win32;%PATH%
7780

7881
echo Performing a clean build of the gcc4mbed samples...
79-
call :RunAndLog %OUR_MAKE% clean
80-
if errorlevel 1 goto ExitOnError
81-
call :RunAndLog %OUR_MAKE%
82+
call :RunAndLog %OUR_MAKE% -C samples/ clean-all LPC1768
8283
if errorlevel 1 goto ExitOnError
8384

8485
echo Cleaning up intermediate files...

0 commit comments

Comments
 (0)