Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Allwinner 2013 naming scheme support for A-Series. #137

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added Allwinner 2013 naming scheme support for A-Series. #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a3056f
Added Allwinner 2013 naming scheme support for A-Series.
Feb 20, 2023
6c517ad
Fix allwinner a100/a133
Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/android-arm64-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")
# Use-specified CMake arguments go last to allow overridding defaults
CMAKE_ARGS+=($@)

cd build/android/arm64-v8a && cmake ../../.. \
cd build/android/arm64-v8a && cmake ../../../../ \
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
Expand Down
2 changes: 1 addition & 1 deletion scripts/android-armv7-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")
# Use-specified CMake arguments go last to allow overridding defaults
CMAKE_ARGS+=($@)

cd build/android/armeabi-v7a && cmake ../../.. \
cd build/android/armeabi-v7a && cmake ../../../../ \
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
Expand Down
2 changes: 1 addition & 1 deletion scripts/android-x86-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")
# Use-specified CMake arguments go last to allow overridding defaults
CMAKE_ARGS+=($@)

cd build/android/x86 && cmake ../../.. \
cd build/android/x86 && cmake ../../../../ \
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
Expand Down
1 change: 1 addition & 0 deletions src/arm/android/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ enum cpuinfo_android_chipset_property {
cpuinfo_android_chipset_property_ro_arch,
cpuinfo_android_chipset_property_ro_chipname,
cpuinfo_android_chipset_property_ro_hardware_chipname,
cpuinfo_android_chipset_property_ro_hardware,
cpuinfo_android_chipset_property_max,
};

Expand Down
5 changes: 5 additions & 0 deletions src/arm/android/properties.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,9 @@ void cpuinfo_arm_android_parse_properties(struct cpuinfo_android_properties prop
const int ro_hardware_chipname_length =
cpuinfo_android_property_get("ro.hardware.chipname", properties->ro_hardware_chipname);
cpuinfo_log_debug("read ro.hardware.chipname = \"%.*s\"", ro_hardware_chipname_length, properties->ro_hardware_chipname);

// Added support for "ro.hardware" property.
const int ro_hardware_length =
cpuinfo_android_property_get("ro.hardware", properties->ro_hardware);
cpuinfo_log_debug("read ro.hardware = \"%.*s\"", ro_hardware_length, properties->ro_hardware);
}
4 changes: 3 additions & 1 deletion src/arm/linux/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
char ro_arch[CPUINFO_BUILD_PROP_VALUE_MAX];
char ro_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
char ro_hardware_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
char ro_hardware[CPUINFO_BUILD_PROP_VALUE_MAX];
};
#endif

Expand Down Expand Up @@ -351,7 +352,8 @@ CPUINFO_INTERNAL struct cpuinfo_arm_chipset
const char ro_arch[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
CPUINFO_INTERNAL struct cpuinfo_arm_chipset
cpuinfo_arm_android_decode_chipset_from_ro_chipname(
const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
uint32_t cores, uint32_t max_cpu_freq_max);
CPUINFO_INTERNAL struct cpuinfo_arm_chipset
cpuinfo_arm_android_decode_chipset_from_ro_hardware_chipname(
const char ro_hardware_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
Expand Down
Loading