mirror of https://github.com/OpenIPC/firmware.git
				
				
				
			Disable thumb2 for development for CV500 platform (#445)
							parent
							
								
									accfb6e818
								
							
						
					
					
						commit
						b3c48f3764
					
				|  | @ -3,7 +3,7 @@ BR2_arm=y | ||||||
| BR2_cortex_a7=y | BR2_cortex_a7=y | ||||||
| BR2_ARM_EABI=y | BR2_ARM_EABI=y | ||||||
| BR2_ARM_FPU_NEON_VFPV4=y | BR2_ARM_FPU_NEON_VFPV4=y | ||||||
| BR2_ARM_INSTRUCTIONS_THUMB2=y | BR2_ARM_INSTRUCTIONS_THUMB2=n | ||||||
| BR2_KERNEL_HEADERS_VERSION=y | BR2_KERNEL_HEADERS_VERSION=y | ||||||
| BR2_DEFAULT_KERNEL_VERSION="4.9.37" | BR2_DEFAULT_KERNEL_VERSION="4.9.37" | ||||||
| BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y | BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ BR2_arm=y | ||||||
| BR2_cortex_a7=y | BR2_cortex_a7=y | ||||||
| BR2_ARM_EABI=y | BR2_ARM_EABI=y | ||||||
| BR2_ARM_FPU_NEON_VFPV4=y | BR2_ARM_FPU_NEON_VFPV4=y | ||||||
| BR2_ARM_INSTRUCTIONS_THUMB2=y | BR2_ARM_INSTRUCTIONS_THUMB2=n | ||||||
| BR2_KERNEL_HEADERS_VERSION=y | BR2_KERNEL_HEADERS_VERSION=y | ||||||
| BR2_DEFAULT_KERNEL_VERSION="4.9.37" | BR2_DEFAULT_KERNEL_VERSION="4.9.37" | ||||||
| BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y | BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ BR2_arm=y | ||||||
| BR2_cortex_a7=y | BR2_cortex_a7=y | ||||||
| BR2_ARM_EABI=y | BR2_ARM_EABI=y | ||||||
| BR2_ARM_FPU_NEON_VFPV4=y | BR2_ARM_FPU_NEON_VFPV4=y | ||||||
| BR2_ARM_INSTRUCTIONS_THUMB2=y | BR2_ARM_INSTRUCTIONS_THUMB2=n | ||||||
| BR2_KERNEL_HEADERS_VERSION=y | BR2_KERNEL_HEADERS_VERSION=y | ||||||
| BR2_DEFAULT_KERNEL_VERSION="4.9.37" | BR2_DEFAULT_KERNEL_VERSION="4.9.37" | ||||||
| BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y | BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ toolchain_by_config() { | ||||||
|   FMT=$2 |   FMT=$2 | ||||||
| 
 | 
 | ||||||
|   BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF) |   BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF) | ||||||
|   if [ ! -z $BR2_VER ]; then |   if [ -n "$BR2_VER" ]; then | ||||||
|     VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') |     VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') | ||||||
|     KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}') |     KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}') | ||||||
|     GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF) |     GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF) | ||||||
|  | @ -20,13 +20,18 @@ toolchain_by_config() { | ||||||
|     else |     else | ||||||
|       # Here we have something from ARM modern family |       # Here we have something from ARM modern family | ||||||
|       HF=$(sed -rn "s/^BR2_ARM_EABI(HF)=y/\1/p" $CF | tr '[:upper:]' '[:lower:]') |       HF=$(sed -rn "s/^BR2_ARM_EABI(HF)=y/\1/p" $CF | tr '[:upper:]' '[:lower:]') | ||||||
|       if [ ! -z "$HF" ]; then |  | ||||||
|         ARCH="${ARCH}_${HF}" |  | ||||||
|       fi |  | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     if [ -z "$ARCH" ]; then |     if [ -z "$ARCH" ]; then | ||||||
|       ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF) |       ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF) | ||||||
|  |     else | ||||||
|  |       THUMB=$(sed -rn "s/^BR2_ARM_INSTRUCTIONS_(THUMB2)=y/\1/p" $CF) | ||||||
|  |       if [ -n "$THUMB" ]; then | ||||||
|  |         ARCH="${ARCH}_${THUMB,,}" | ||||||
|  |       fi | ||||||
|  |       if [ -n "$HF" ]; then | ||||||
|  |         ARCH="${ARCH}_${HF}" | ||||||
|  |       fi | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF) |     LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF) | ||||||
|  | @ -40,7 +45,7 @@ toolchain_by_config() { | ||||||
|         echo $ARCH $GCC_VER $LIBC $KVER |         echo $ARCH $GCC_VER $LIBC $KVER | ||||||
|         ;; |         ;; | ||||||
|       *) |       *) | ||||||
|         if [ ! -z "$2" ]; then |         if [ -n "$2" ]; then | ||||||
|           BR_DIR=buildroot-$2 |           BR_DIR=buildroot-$2 | ||||||
|           GCC_VER=$(sed -rn \ |           GCC_VER=$(sed -rn \ | ||||||
|             "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ |             "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue