Google Git
Sign in
android/platform/external/u-boot/c0d66ec9a419a43beea81c3b7168d9fb2f3fd035
commit
c0d66ec9a419a43beea81c3b7168d9fb2f3fd035
[log]
author
Alistair Delva <adelva@google.com>
Thu Oct 21 13:19:02 2021 -0700
committer
Alistair Delva <adelva@google.com>
Thu Oct 21 13:19:05 2021 -0700
tree
33c0e1a3a013a3b896c8a00cf5b7464d1b1ac837
parent
40baf7748548cd740037e42f2603e0de448cf79a [diff]
ANDROID: Fix qemu-minimal after upstream merge

This fixes a serious problem on arm64 which is caused by CONFIG_BLK
being changed to 'default y' if DM_MMC or DM_USB are set. After our
minimal config neither of these are set on arm64, so BLK gets disabled
unintentionally. Explicitly enable BLK.

Also disable CONFIG_I2C which became 'default y' upstream, but we don't
have an emulated I2C bus so this is pure bloat.

Change-Id: I621f50610a0623595d8f858af4827a9d534cebba
1 file changed
tree: 33c0e1a3a013a3b896c8a00cf5b7464d1b1ac837
  1. .github/
  2. api/
  3. arch/
  4. board/
  5. cmd/
  6. common/
  7. configs/
  8. disk/
  9. doc/
  10. drivers/
  11. dts/
  12. env/
  13. examples/
  14. fs/
  15. include/
  16. lib/
  17. Licenses/
  18. net/
  19. post/
  20. scripts/
  21. test/
  22. tools/
  23. .azure-pipelines.yml
  24. .checkpatch.conf
  25. .gitattributes
  26. .gitignore
  27. .gitlab-ci.yml
  28. .mailmap
  29. .readthedocs.yml
  30. arm.fragment
  31. avb_locked.fragment
  32. avb_unlocked.fragment
  33. bl31.elf
  34. build.config.aarch64
  35. build.config.arm
  36. build.config.beagle_x15
  37. build.config.common
  38. build.config.crosvm.aarch64
  39. build.config.crosvm.x86_64
  40. build.config.crosvm_locked.aarch64
  41. build.config.crosvm_locked.x86_64
  42. build.config.kiwi
  43. build.config.kiwi_l
  44. build.config.kiwi_p
  45. build.config.pvmfw
  46. build.config.qemu.aarch64
  47. build.config.qemu.arm
  48. build.config.qemu.x86_64
  49. build.config.rockpi4
  50. build.config.tools
  51. build.config.x86_64
  52. build_rk3399_bl31.sh
  53. config.mk
  54. crosvm-aarch64.fragment
  55. crosvm-x86_64.fragment
  56. crosvm.fragment
  57. cuttlefish.fragment
  58. default.avbpubkey
  59. Kbuild
  60. Kconfig
  61. kiwi.avbpubkey
  62. kiwi.fragment
  63. kiwi_env.txt
  64. kiwi_l.fragment
  65. kiwi_p.fragment
  66. LICENSE
  67. MAINTAINERS
  68. Makefile
  69. METADATA
  70. MODULE_LICENSE_GPL
  71. OWNERS
  72. pvmfw.fragment
  73. qemu-minimal.fragment
  74. README
  75. rockpi4.fragment
  76. testkey_rsa2048.avbpubkey
  77. testkey_rsa4096.avbpubkey
  78. x86.fragment