You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/25 20:55:48 UTC
[1/2] incubator-mynewt-core git commit: Fix download scripts when
MFG_IMAGE is not defined
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop fda91e8ac -> b1a4724c6
Fix download scripts when MFG_IMAGE is not defined
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/86b14593
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/86b14593
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/86b14593
Branch: refs/heads/develop
Commit: 86b14593eedbfe79d9ff90c7c2385b4543bc0575
Parents: fda91e8
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Oct 25 13:52:02 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Oct 25 13:52:02 2016 -0700
----------------------------------------------------------------------
hw/bsp/arduino_primo_nrf52/primo_download.sh | 2 +-
hw/bsp/bmd300eval/bmd300eval_download.sh | 2 +-
hw/bsp/frdm-k64f/frdm-k64_download.sh | 2 +-
hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh | 2 +-
hw/bsp/nrf51-blenano/nrf51dk_download.sh | 2 +-
hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh | 2 +-
hw/bsp/nrf51dk/nrf51dk_download.sh | 2 +-
hw/bsp/nrf52dk/nrf52dk_download.sh | 2 +-
hw/bsp/nucleo-f401re/nucleo-f401re_download.sh | 2 +-
.../olimex_stm32-e407_devboard_download.sh | 2 +-
hw/bsp/rb-nano2/rb-nano2_download.sh | 2 +-
hw/bsp/stm32f4discovery/stm32f4discovery_download.sh | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/arduino_primo_nrf52/primo_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/primo_download.sh b/hw/bsp/arduino_primo_nrf52/primo_download.sh
index c294ed3..3bdcf9a 100755
--- a/hw/bsp/arduino_primo_nrf52/primo_download.sh
+++ b/hw/bsp/arduino_primo_nrf52/primo_download.sh
@@ -44,7 +44,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/bmd300eval/bmd300eval_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/bmd300eval_download.sh b/hw/bsp/bmd300eval/bmd300eval_download.sh
index 5c0082c..b5e6537 100755
--- a/hw/bsp/bmd300eval/bmd300eval_download.sh
+++ b/hw/bsp/bmd300eval/bmd300eval_download.sh
@@ -40,7 +40,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/frdm-k64f/frdm-k64_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/frdm-k64f/frdm-k64_download.sh b/hw/bsp/frdm-k64f/frdm-k64_download.sh
index 65d4698..fccd7e0 100755
--- a/hw/bsp/frdm-k64f/frdm-k64_download.sh
+++ b/hw/bsp/frdm-k64f/frdm-k64_download.sh
@@ -44,7 +44,7 @@ for feature in ${FEATURES}; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh b/hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh
index 9dc02d7..35fd647 100755
--- a/hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh
+++ b/hw/bsp/nrf51-arduino_101/nrf51dk-16kbram_download.sh
@@ -42,7 +42,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/nrf51-blenano/nrf51dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/nrf51dk_download.sh b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
index c9bdf7d..d6e9eac 100755
--- a/hw/bsp/nrf51-blenano/nrf51dk_download.sh
+++ b/hw/bsp/nrf51-blenano/nrf51dk_download.sh
@@ -42,7 +42,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
index 005e3f3..8fc8055 100755
--- a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
+++ b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
@@ -42,7 +42,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/nrf51dk/nrf51dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/nrf51dk_download.sh b/hw/bsp/nrf51dk/nrf51dk_download.sh
index 10b3c43..7148e78 100755
--- a/hw/bsp/nrf51dk/nrf51dk_download.sh
+++ b/hw/bsp/nrf51dk/nrf51dk_download.sh
@@ -42,7 +42,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/nrf52dk/nrf52dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/nrf52dk_download.sh b/hw/bsp/nrf52dk/nrf52dk_download.sh
index 5c0082c..b5e6537 100755
--- a/hw/bsp/nrf52dk/nrf52dk_download.sh
+++ b/hw/bsp/nrf52dk/nrf52dk_download.sh
@@ -40,7 +40,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh b/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
index 3dd7032..ccf7bf3 100755
--- a/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
+++ b/hw/bsp/nucleo-f401re/nucleo-f401re_download.sh
@@ -40,7 +40,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh b/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
index 7b3aa84..7c52f6b 100755
--- a/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
+++ b/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
@@ -40,7 +40,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/rb-nano2/rb-nano2_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/rb-nano2_download.sh b/hw/bsp/rb-nano2/rb-nano2_download.sh
index 8230d24..31dcdee 100755
--- a/hw/bsp/rb-nano2/rb-nano2_download.sh
+++ b/hw/bsp/rb-nano2/rb-nano2_download.sh
@@ -42,7 +42,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/86b14593/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh b/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
index 9e7a34a..ee6d352 100755
--- a/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
+++ b/hw/bsp/stm32f4discovery/stm32f4discovery_download.sh
@@ -40,7 +40,7 @@ for feature in $FEATURES; do
fi
done
-if [ "$MFG_IMAGE" -eq 1 ]; then
+if [ "$MFG_IMAGE" ]; then
FLASH_OFFSET=0x0
FILE_NAME=$BIN_BASENAME.bin
elif [ $IS_BOOTLOADER -eq 1 ]; then
[2/2] incubator-mynewt-core git commit: ocf_sample - Always include
console (for logging).
Posted by cc...@apache.org.
ocf_sample - Always include console (for logging).
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/b1a4724c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/b1a4724c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/b1a4724c
Branch: refs/heads/develop
Commit: b1a4724c6ff196d10b9cb7c54c0f2a0a7de6a2f8
Parents: 86b1459
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Oct 25 13:55:31 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Oct 25 13:55:31 2016 -0700
----------------------------------------------------------------------
apps/ocf_sample/pkg.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/b1a4724c/apps/ocf_sample/pkg.yml
----------------------------------------------------------------------
diff --git a/apps/ocf_sample/pkg.yml b/apps/ocf_sample/pkg.yml
index 5e37779..c18f2eb 100644
--- a/apps/ocf_sample/pkg.yml
+++ b/apps/ocf_sample/pkg.yml
@@ -28,10 +28,10 @@ pkg.deps:
- kernel/os
- sys/log
- net/oic
+ - sys/console/full
pkg.deps.OC_TRANSPORT_SERIAL:
- sys/shell
- - sys/console/full
pkg.deps.OC_TRANSPORT_GATT:
- net/nimble/controller