diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2015-02-11 21:34:58 +0100 |
|---|---|---|
| committer | Andrei Gherzan <andrei@resin.io> | 2015-03-01 00:59:51 +0100 |
| commit | 1350ba8acf4b5bb03b26a00da91a6698d4b7e2da (patch) | |
| tree | a27ac97603597ecfb665c6d5946fb95812836a5c | |
| parent | 6392a639852eebd2386726cc594c214ec0df0f3a (diff) | |
| download | meta-raspberrypi-1350ba8acf4b5bb03b26a00da91a6698d4b7e2da.tar.gz | |
raspberrypi.conf: Use arm1176jzfshf as default tune
Reformat the tune-arm1176jzf-s.inc file.
There is not 'PACKAGE_EXTRA_ARCHS_tune-armv6hf-vfp'. Replace it by
'PACKAGE_EXTRA_ARCHS_tune-armv6hf'.
Change-Id: I0dd63b1dd3e1ebc7fe0600e93fb9d27a6a833cd9
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
| -rw-r--r-- | conf/machine/include/tune-arm1176jzf-s.inc | 13 | ||||
| -rw-r--r-- | conf/machine/raspberrypi.conf | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/conf/machine/include/tune-arm1176jzf-s.inc b/conf/machine/include/tune-arm1176jzf-s.inc index a5368a3..b6fcc59 100644 --- a/conf/machine/include/tune-arm1176jzf-s.inc +++ b/conf/machine/include/tune-arm1176jzf-s.inc | |||
| @@ -6,13 +6,10 @@ TUNEVALID[arm1176jzfs] = "Enable arm1176jzfs specific processor optimizations" | |||
| 6 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzfs", "-mtune=arm1176jzf-s", "", d)}" | 6 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzfs", "-mtune=arm1176jzf-s", "", d)}" |
| 7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "vfp", "-mfpu=vfp", "", d)}" | 7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "vfp", "-mfpu=vfp", "", d)}" |
| 8 | 8 | ||
| 9 | AVAILTUNES += "arm1176jzfs" | 9 | AVAILTUNES += "arm1176jzfs arm1176jzfshf" |
| 10 | TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs" | ||
| 11 | ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" | 10 | ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" |
| 12 | PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}" | ||
| 13 | |||
| 14 | AVAILTUNES += "arm1176jzfshf" | ||
| 15 | TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" | ||
| 16 | ARMPKGARCH_tune-arm1176jzfshf = "arm1176jzfs" | 11 | ARMPKGARCH_tune-arm1176jzfshf = "arm1176jzfs" |
| 17 | PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf-vfp} arm1176jzfshf-vfp" | 12 | TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs" |
| 18 | 13 | TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" | |
| 14 | PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}" | ||
| 15 | PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1176jzfshf-vfp" | ||
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index 4e887b3..e8516e7 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf | |||
| @@ -2,5 +2,7 @@ | |||
| 2 | #@NAME: RaspberryPi Development Board | 2 | #@NAME: RaspberryPi Development Board |
| 3 | #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board | 3 | #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board |
| 4 | 4 | ||
| 5 | DEFAULTTUNE ?= "arm1176jzfshf" | ||
| 6 | |||
| 5 | require conf/machine/include/tune-arm1176jzf-s.inc | 7 | require conf/machine/include/tune-arm1176jzf-s.inc |
| 6 | include conf/machine/include/rpi-base.inc | 8 | include conf/machine/include/rpi-base.inc |